From 99e00ff4a4542e5fb3378e2d8c18e0eeabc0bb29 Mon Sep 17 00:00:00 2001
From: 吴健 <14790700720@163.com>
Date: 星期六, 16 十一月 2024 10:50:08 +0800
Subject: [PATCH] add domain
---
billion-main/src/main/java/service/ScCollectionParamConfService.java | 13
billion-main/src/main/java/domain/DaParamCollection.java | 60 ++++
billion-main/src/main/resources/mapper/DaStationCollectionMapper.xml | 22 +
billion-main/src/main/java/service/DaStationCollectionService.java | 13
billion-main/src/main/java/service/impl/DaParamCollectionServiceImpl.java | 22 +
billion-main/src/main/resources/mapper/ScCollectionParamConfMapper.xml | 40 ++
billion-main/src/main/java/service/DaTightenCollectionService.java | 13
billion-main/src/main/java/service/impl/ScCollectionParamConfServiceImpl.java | 22 +
billion-main/src/main/java/mapper/DaTightenCollectionMapper.java | 18 +
billion-main/src/main/java/service/impl/DaMaterialCollectionServiceImpl.java | 23 +
billion-main/src/main/java/mapper/DaParamCollectionMapper.java | 18 +
billion-main/src/main/java/mapper/ScCollectionParamConfMapper.java | 18 +
billion-admin/src/main/resources/application.yml | 2
billion-main/src/main/resources/mapper/DaParamCollectionMapper.xml | 22 +
billion-main/src/main/java/service/DaParamCollectionService.java | 13
billion-main/src/main/resources/mapper/DaMaterialCollectionMapper.xml | 22 +
billion-main/src/main/resources/mapper/DaTightenCollectionMapper.xml | 26 +
billion-main/src/main/java/domain/DaStationCollection.java | 60 ++++
billion-main/src/main/java/service/DaMaterialCollectionService.java | 13
/dev/null | 91 ------
billion-main/src/main/java/mapper/DaMaterialCollectionMapper.java | 18 +
billion-main/src/main/java/domain/DaMaterialCollection.java | 60 ++++
billion-main/src/main/java/domain/ScCollectionParamConf.java | 130 ++++++++
billion-main/src/main/java/mapper/DaStationCollectionMapper.java | 18 +
billion-main/src/main/java/service/impl/DaTightenCollectionServiceImpl.java | 22 +
billion-main/src/main/java/domain/DaTightenCollection.java | 75 +++++
billion-main/src/main/java/service/impl/DaStationCollectionServiceImpl.java | 22 +
27 files changed, 784 insertions(+), 92 deletions(-)
diff --git a/billion-admin/src/main/resources/application.yml b/billion-admin/src/main/resources/application.yml
index 5e2e740..61c74a1 100644
--- a/billion-admin/src/main/resources/application.yml
+++ b/billion-admin/src/main/resources/application.yml
@@ -139,7 +139,7 @@
columnFormat: null
tableUnderline: true
capitalMode: false
- logicDeleteField: deleted
+ logicDeleteField: del_flag
# 閫昏緫宸插垹闄ゅ��
logicDeleteValue: 1
# 閫昏緫鏈垹闄ゅ��
diff --git a/billion-main/src/main/java/com/billion/main/bs/workshop/controller/BsWorkshopController.java b/billion-main/src/main/java/com/billion/main/bs/workshop/controller/BsWorkshopController.java
deleted file mode 100644
index f2c82bf..0000000
--- a/billion-main/src/main/java/com/billion/main/bs/workshop/controller/BsWorkshopController.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package com.billion.main.bs.workshop.controller;
-
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.billion.common.annotation.Log;
-import com.billion.common.core.controller.BaseController;
-import com.billion.common.core.domain.AjaxResult;
-import com.billion.common.enums.BusinessType;
-import com.billion.main.bs.workshop.domain.BsWorkshop;
-import com.billion.main.bs.workshop.service.IBsWorkshopService;
-import com.billion.common.utils.poi.ExcelUtil;
-import com.billion.common.core.page.TableDataInfo;
-
-/**
- * 杞﹂棿淇℃伅Controller
- *
- * @author Billion-Yi
- * @date 2024-11-12
- */
-@RestController
-@RequestMapping("/bs/workshop")
-public class BsWorkshopController extends BaseController
-{
- @Autowired
- private IBsWorkshopService bsWorkshopService;
-
- /**
- * 鏌ヨ杞﹂棿淇℃伅鍒楄〃
- */
- @PreAuthorize("@ss.hasPermi('bs:workshop:list')")
- @GetMapping("/list")
- public TableDataInfo list(BsWorkshop bsWorkshop)
- {
- startPage();
- List<BsWorkshop> list = bsWorkshopService.selectBsWorkshopList(bsWorkshop);
- return getDataTable(list);
- }
-
- /**
- * 瀵煎嚭杞﹂棿淇℃伅鍒楄〃
- */
- @PreAuthorize("@ss.hasPermi('bs:workshop:export')")
- @Log(title = "杞﹂棿淇℃伅", businessType = BusinessType.EXPORT)
- @PostMapping("/export")
- public void export(HttpServletResponse response, BsWorkshop bsWorkshop)
- {
- List<BsWorkshop> list = bsWorkshopService.selectBsWorkshopList(bsWorkshop);
- ExcelUtil<BsWorkshop> util = new ExcelUtil<BsWorkshop>(BsWorkshop.class);
- util.exportExcel(response, list, "杞﹂棿淇℃伅鏁版嵁");
- }
-
- /**
- * 鑾峰彇杞﹂棿淇℃伅璇︾粏淇℃伅
- */
- @PreAuthorize("@ss.hasPermi('bs:workshop:query')")
- @GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
- return success(bsWorkshopService.selectBsWorkshopById(id));
- }
-
- /**
- * 鏂板杞﹂棿淇℃伅
- */
- @PreAuthorize("@ss.hasPermi('bs:workshop:add')")
- @Log(title = "杞﹂棿淇℃伅", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@RequestBody BsWorkshop bsWorkshop)
- {
- return toAjax(bsWorkshopService.insertBsWorkshop(bsWorkshop));
- }
-
- /**
- * 淇敼杞﹂棿淇℃伅
- */
- @PreAuthorize("@ss.hasPermi('bs:workshop:edit')")
- @Log(title = "杞﹂棿淇℃伅", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@RequestBody BsWorkshop bsWorkshop)
- {
- return toAjax(bsWorkshopService.updateBsWorkshop(bsWorkshop));
- }
-
- /**
- * 鍒犻櫎杞﹂棿淇℃伅
- */
- @PreAuthorize("@ss.hasPermi('bs:workshop:remove')")
- @Log(title = "杞﹂棿淇℃伅", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
- return toAjax(bsWorkshopService.deleteBsWorkshopByIds(ids));
- }
-
- @PostMapping("/mybatisPlusList")
- public AjaxResult mybatisPlusList()
- {
- return AjaxResult.success(bsWorkshopService.list());
- }
-}
diff --git a/billion-main/src/main/java/com/billion/main/bs/workshop/domain/BsWorkshop.java b/billion-main/src/main/java/com/billion/main/bs/workshop/domain/BsWorkshop.java
deleted file mode 100644
index a6a182e..0000000
--- a/billion-main/src/main/java/com/billion/main/bs/workshop/domain/BsWorkshop.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.billion.main.bs.workshop.domain;
-
-import common.BaseEntity;
-import lombok.Data;
-import com.billion.common.annotation.Excel;
-
-/**
- * 杞﹂棿淇℃伅瀵硅薄 bs_workshop
- *
- * @author Billion-Yi
- * @date 2024-11-12
- */
-@Data
-public class BsWorkshop extends BaseEntity
-{
- /** 杞﹂棿缂栫爜 */
- @Excel(name = "杞﹂棿缂栫爜")
- private String workshopCode;
-
- /** 杞﹂棿鍚嶇О */
- @Excel(name = "杞﹂棿鍚嶇О")
- private String workshopName;
-
- /** 澶囩敤瀛楁1 */
- private String spareField1;
-
- /** 澶囩敤瀛楁2 */
- private String spareField2;
-
- /** 澶囨敞 */
- @Excel(name = "澶囨敞")
- private String remarks;
-}
diff --git a/billion-main/src/main/java/com/billion/main/bs/workshop/mapper/BsWorkshopMapper.java b/billion-main/src/main/java/com/billion/main/bs/workshop/mapper/BsWorkshopMapper.java
deleted file mode 100644
index fbe471e..0000000
--- a/billion-main/src/main/java/com/billion/main/bs/workshop/mapper/BsWorkshopMapper.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.billion.main.bs.workshop.mapper;
-
-import java.util.List;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.billion.main.bs.workshop.domain.BsWorkshop;
-
-/**
- * 杞﹂棿淇℃伅Mapper鎺ュ彛
- *
- * @author Billion-Yi
- * @date 2024-11-12
- */
-public interface BsWorkshopMapper extends BaseMapper<BsWorkshop>
-{
- /**
- * 鏌ヨ杞﹂棿淇℃伅
- *
- * @param id 杞﹂棿淇℃伅涓婚敭
- * @return 杞﹂棿淇℃伅
- */
- public BsWorkshop selectBsWorkshopById(Long id);
-
- /**
- * 鏌ヨ杞﹂棿淇℃伅鍒楄〃
- *
- * @param bsWorkshop 杞﹂棿淇℃伅
- * @return 杞﹂棿淇℃伅闆嗗悎
- */
- public List<BsWorkshop> selectBsWorkshopList(BsWorkshop bsWorkshop);
-
- /**
- * 鏂板杞﹂棿淇℃伅
- *
- * @param bsWorkshop 杞﹂棿淇℃伅
- * @return 缁撴灉
- */
- public int insertBsWorkshop(BsWorkshop bsWorkshop);
-
- /**
- * 淇敼杞﹂棿淇℃伅
- *
- * @param bsWorkshop 杞﹂棿淇℃伅
- * @return 缁撴灉
- */
- public int updateBsWorkshop(BsWorkshop bsWorkshop);
-
- /**
- * 鍒犻櫎杞﹂棿淇℃伅
- *
- * @param id 杞﹂棿淇℃伅涓婚敭
- * @return 缁撴灉
- */
- public int deleteBsWorkshopById(Long id);
-
- /**
- * 鎵归噺鍒犻櫎杞﹂棿淇℃伅
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
- * @return 缁撴灉
- */
- public int deleteBsWorkshopByIds(Long[] ids);
-}
diff --git a/billion-main/src/main/java/com/billion/main/bs/workshop/service/IBsWorkshopService.java b/billion-main/src/main/java/com/billion/main/bs/workshop/service/IBsWorkshopService.java
deleted file mode 100644
index 2388902..0000000
--- a/billion-main/src/main/java/com/billion/main/bs/workshop/service/IBsWorkshopService.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.billion.main.bs.workshop.service;
-
-import java.util.List;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.billion.main.bs.workshop.domain.BsWorkshop;
-
-/**
- * 杞﹂棿淇℃伅Service鎺ュ彛
- *
- * @author Billion-Yi
- * @date 2024-11-12
- */
-public interface IBsWorkshopService extends IService<BsWorkshop>
-{
- /**
- * 鏌ヨ杞﹂棿淇℃伅
- *
- * @param id 杞﹂棿淇℃伅涓婚敭
- * @return 杞﹂棿淇℃伅
- */
- public BsWorkshop selectBsWorkshopById(Long id);
-
- /**
- * 鏌ヨ杞﹂棿淇℃伅鍒楄〃
- *
- * @param bsWorkshop 杞﹂棿淇℃伅
- * @return 杞﹂棿淇℃伅闆嗗悎
- */
- public List<BsWorkshop> selectBsWorkshopList(BsWorkshop bsWorkshop);
-
- /**
- * 鏂板杞﹂棿淇℃伅
- *
- * @param bsWorkshop 杞﹂棿淇℃伅
- * @return 缁撴灉
- */
- public int insertBsWorkshop(BsWorkshop bsWorkshop);
-
- /**
- * 淇敼杞﹂棿淇℃伅
- *
- * @param bsWorkshop 杞﹂棿淇℃伅
- * @return 缁撴灉
- */
- public int updateBsWorkshop(BsWorkshop bsWorkshop);
-
- /**
- * 鎵归噺鍒犻櫎杞﹂棿淇℃伅
- *
- * @param ids 闇�瑕佸垹闄ょ殑杞﹂棿淇℃伅涓婚敭闆嗗悎
- * @return 缁撴灉
- */
- public int deleteBsWorkshopByIds(Long[] ids);
-
- /**
- * 鍒犻櫎杞﹂棿淇℃伅淇℃伅
- *
- * @param id 杞﹂棿淇℃伅涓婚敭
- * @return 缁撴灉
- */
- public int deleteBsWorkshopById(Long id);
-}
diff --git a/billion-main/src/main/java/com/billion/main/bs/workshop/service/impl/BsWorkshopServiceImpl.java b/billion-main/src/main/java/com/billion/main/bs/workshop/service/impl/BsWorkshopServiceImpl.java
deleted file mode 100644
index 1c2b28c..0000000
--- a/billion-main/src/main/java/com/billion/main/bs/workshop/service/impl/BsWorkshopServiceImpl.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package com.billion.main.bs.workshop.service.impl;
-
-import java.util.List;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.billion.common.annotation.DataSource;
-import com.billion.common.enums.DataSourceType;
-import com.billion.common.utils.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.billion.main.bs.workshop.mapper.BsWorkshopMapper;
-import com.billion.main.bs.workshop.domain.BsWorkshop;
-import com.billion.main.bs.workshop.service.IBsWorkshopService;
-
-/**
- * 杞﹂棿淇℃伅Service涓氬姟灞傚鐞�
- *
- * @author Billion-Yi
- * @date 2024-11-12
- */
-@Service
-@DataSource(value = DataSourceType.SLAVE)
-public class BsWorkshopServiceImpl extends ServiceImpl<BsWorkshopMapper, BsWorkshop> implements IBsWorkshopService
-{
- @Autowired
- private BsWorkshopMapper bsWorkshopMapper;
-
- /**
- * 鏌ヨ杞﹂棿淇℃伅
- *
- * @param id 杞﹂棿淇℃伅涓婚敭
- * @return 杞﹂棿淇℃伅
- */
- @Override
- public BsWorkshop selectBsWorkshopById(Long id)
- {
- return bsWorkshopMapper.selectBsWorkshopById(id);
- }
-
- /**
- * 鏌ヨ杞﹂棿淇℃伅鍒楄〃
- *
- * @param bsWorkshop 杞﹂棿淇℃伅
- * @return 杞﹂棿淇℃伅
- */
- @Override
- public List<BsWorkshop> selectBsWorkshopList(BsWorkshop bsWorkshop)
- {
- return bsWorkshopMapper.selectBsWorkshopList(bsWorkshop);
- }
-
- /**
- * 鏂板杞﹂棿淇℃伅
- *
- * @param bsWorkshop 杞﹂棿淇℃伅
- * @return 缁撴灉
- */
- @Override
- public int insertBsWorkshop(BsWorkshop bsWorkshop)
- {
- bsWorkshop.setCreateTime(DateUtils.getNowDate());
- return bsWorkshopMapper.insertBsWorkshop(bsWorkshop);
- }
-
- /**
- * 淇敼杞﹂棿淇℃伅
- *
- * @param bsWorkshop 杞﹂棿淇℃伅
- * @return 缁撴灉
- */
- @Override
- public int updateBsWorkshop(BsWorkshop bsWorkshop)
- {
- bsWorkshop.setUpdateTime(DateUtils.getNowDate());
- return bsWorkshopMapper.updateBsWorkshop(bsWorkshop);
- }
-
- /**
- * 鎵归噺鍒犻櫎杞﹂棿淇℃伅
- *
- * @param ids 闇�瑕佸垹闄ょ殑杞﹂棿淇℃伅涓婚敭
- * @return 缁撴灉
- */
- @Override
- public int deleteBsWorkshopByIds(Long[] ids)
- {
- return bsWorkshopMapper.deleteBsWorkshopByIds(ids);
- }
-
- /**
- * 鍒犻櫎杞﹂棿淇℃伅淇℃伅
- *
- * @param id 杞﹂棿淇℃伅涓婚敭
- * @return 缁撴灉
- */
- @Override
- public int deleteBsWorkshopById(Long id)
- {
- return bsWorkshopMapper.deleteBsWorkshopById(id);
- }
-}
diff --git a/billion-main/src/main/java/domain/DaMaterialCollection.java b/billion-main/src/main/java/domain/DaMaterialCollection.java
new file mode 100644
index 0000000..75913e5
--- /dev/null
+++ b/billion-main/src/main/java/domain/DaMaterialCollection.java
@@ -0,0 +1,60 @@
+package domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.StringSerializer;
+import lombok.Data;
+
+/**
+ * 鎷х揣閲囬泦
+ * @TableName da_material_collection
+ */
+@TableName(value ="da_material_collection")
+@Data
+public class DaMaterialCollection implements Serializable {
+ /**
+ * 涓婚敭id
+ */
+ @TableId(type = IdType.AUTO)
+ @JsonSerialize(using = StringSerializer.class)
+ private Long id;
+
+ /**
+ * 鎬绘垚搴忓垪鍙�
+ */
+ private String sfcCode;
+
+ /**
+ * 宸ヤ綅缂栫爜
+ */
+ private String locationCode;
+
+ /**
+ * 鍙傛暟缂栫爜
+ */
+ private String paramCode;
+
+ /**
+ * 鍙傛暟鍚嶇О
+ */
+ private String paramName;
+
+ /**
+ * 鍙傛暟鍊�
+ */
+ private String paramValue;
+
+ /**
+ * 閲囬泦鏃堕棿
+ */
+ private Date collectTime;
+
+ @TableField(exist = false)
+ private static final long serialVersionUID = 1L;
+}
\ No newline at end of file
diff --git a/billion-main/src/main/java/domain/DaParamCollection.java b/billion-main/src/main/java/domain/DaParamCollection.java
new file mode 100644
index 0000000..2cfc902
--- /dev/null
+++ b/billion-main/src/main/java/domain/DaParamCollection.java
@@ -0,0 +1,60 @@
+package domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.StringSerializer;
+import lombok.Data;
+
+/**
+ * 鍙傛暟閲囬泦
+ * @TableName da_param_collection
+ */
+@TableName(value ="da_param_collection")
+@Data
+public class DaParamCollection implements Serializable {
+ /**
+ * 涓婚敭id
+ */
+ @TableId(type = IdType.AUTO)
+ @JsonSerialize(using = StringSerializer.class)
+ private Long id;
+
+ /**
+ * 鎬绘垚搴忓垪鍙�
+ */
+ private String sfcCode;
+
+ /**
+ * 宸ヤ綅缂栫爜
+ */
+ private String locationCode;
+
+ /**
+ * 鍙傛暟缂栫爜
+ */
+ private String paramCode;
+
+ /**
+ * 鍙傛暟鍚嶇О
+ */
+ private String paramName;
+
+ /**
+ * 鍙傛暟鍊�
+ */
+ private String paramValue;
+
+ /**
+ * 閲囬泦鏃堕棿
+ */
+ private Date collectTime;
+
+ @TableField(exist = false)
+ private static final long serialVersionUID = 1L;
+}
\ No newline at end of file
diff --git a/billion-main/src/main/java/domain/DaStationCollection.java b/billion-main/src/main/java/domain/DaStationCollection.java
new file mode 100644
index 0000000..6ae0646
--- /dev/null
+++ b/billion-main/src/main/java/domain/DaStationCollection.java
@@ -0,0 +1,60 @@
+package domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.StringSerializer;
+import lombok.Data;
+
+/**
+ * 杩囩珯閲囬泦
+ * @TableName da_station_collection
+ */
+@TableName(value ="da_station_collection")
+@Data
+public class DaStationCollection implements Serializable {
+ /**
+ * 涓婚敭id
+ */
+ @TableId(type = IdType.AUTO)
+ @JsonSerialize(using = StringSerializer.class)
+ private Long id;
+
+ /**
+ * 鎬绘垚搴忓垪鍙�
+ */
+ private String sfcCode;
+
+ /**
+ * 宸ヤ綅缂栫爜
+ */
+ private String locationCode;
+
+ /**
+ * 杩涚珯鏃堕棿
+ */
+ private Date inboundTime;
+
+ /**
+ * 鍑虹珯鏃堕棿
+ */
+ private Date outboundTime;
+
+ /**
+ * 鐘舵�侊紙1鍚堟牸0涓嶅悎鏍硷級
+ */
+ private String status;
+
+ /**
+ * 閲囬泦鏃堕棿
+ */
+ private Date collectTime;
+
+ @TableField(exist = false)
+ private static final long serialVersionUID = 1L;
+}
\ No newline at end of file
diff --git a/billion-main/src/main/java/domain/DaTightenCollection.java b/billion-main/src/main/java/domain/DaTightenCollection.java
new file mode 100644
index 0000000..6d07ae8
--- /dev/null
+++ b/billion-main/src/main/java/domain/DaTightenCollection.java
@@ -0,0 +1,75 @@
+package domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.StringSerializer;
+import lombok.Data;
+
+/**
+ * 鎷х揣閲囬泦
+ * @TableName da_tighten_collection
+ */
+@TableName(value ="da_tighten_collection")
+@Data
+public class DaTightenCollection implements Serializable {
+ /**
+ * 涓婚敭id
+ */
+ @TableId(type = IdType.AUTO)
+ @JsonSerialize(using = StringSerializer.class)
+ private Long id;
+
+ /**
+ * 鎬绘垚搴忓垪鍙�
+ */
+ private String sfcCode;
+
+ /**
+ * 宸ヤ綅缂栫爜
+ */
+ private String locationCode;
+
+ /**
+ * 鍙傛暟闆嗙紪鐮�
+ */
+ private String paramSetCode;
+
+ /**
+ * 鍙傛暟闆嗗悕绉�
+ */
+ private String paramSetName;
+
+ /**
+ * 鎵煩鍊�
+ */
+ private String torque;
+
+ /**
+ * 鎵煩鐘舵��
+ */
+ private String torqueStatus;
+
+ /**
+ * 瑙掑害鍊�
+ */
+ private String angle;
+
+ /**
+ * 瑙掑害鐘舵��
+ */
+ private String angleStatus;
+
+ /**
+ * 閲囬泦鏃堕棿
+ */
+ private Date collectTime;
+
+ @TableField(exist = false)
+ private static final long serialVersionUID = 1L;
+}
\ No newline at end of file
diff --git a/billion-main/src/main/java/domain/ScCollectionParamConf.java b/billion-main/src/main/java/domain/ScCollectionParamConf.java
new file mode 100644
index 0000000..e156651
--- /dev/null
+++ b/billion-main/src/main/java/domain/ScCollectionParamConf.java
@@ -0,0 +1,130 @@
+package domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.StringSerializer;
+import lombok.Data;
+
+/**
+ * 鍙傛暟閲囬泦閰嶇疆
+ * @TableName sc_collection_param_conf
+ */
+@TableName(value ="sc_collection_param_conf")
+@Data
+public class ScCollectionParamConf implements Serializable {
+ /**
+ * 涓婚敭id
+ */
+ @TableId(type = IdType.AUTO)
+ @JsonSerialize(using = StringSerializer.class)
+ private Long id;
+
+ /**
+ * 浜у搧缂栫爜
+ */
+ private String productCode;
+
+ /**
+ * 浜у搧鍨嬪彿
+ */
+ private String productType;
+
+ /**
+ * 宸ヤ綅缂栫爜
+ */
+ private String locationCode;
+
+ /**
+ * 鍙傛暟缂栫爜
+ */
+ private String paramCode;
+
+ /**
+ * 鍙傛暟鍚嶇О
+ */
+ private String paramName;
+
+ /**
+ * 鍙傛暟闆嗙紪鐮�
+ */
+ private String paramSetCode;
+
+ /**
+ * 鍙傛暟闆嗗悕绉�
+ */
+ private String paramSetName;
+
+ /**
+ * 閲囬泦鍦板潃
+ */
+ private String node;
+
+ /**
+ * 閲囬泦绫诲瀷锛�1鐗╂枡杩芥函锛�2鎷х揣杩芥函锛屽叾浠栵級
+ */
+ private String type;
+
+ /**
+ * 鍗曚綅
+ */
+ private String unit;
+
+ /**
+ * 涓婇檺鍊�
+ */
+ private String paramUpper;
+
+ /**
+ * 涓嬮檺鍊�
+ */
+ private String paramLower;
+
+ /**
+ * 涓績鍊�
+ */
+ private String paramCentral;
+
+ /**
+ * 鏄剧ず椤哄簭
+ */
+ private Integer orderNum;
+
+ /**
+ * 鏄惁璁㈤槄
+ */
+ private String subscribe;
+
+ /**
+ * 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 1浠ｈ〃鍒犻櫎锛�
+ */
+ private String delFlag;
+
+ /**
+ * 鍒涘缓鑰�
+ */
+ private String createBy;
+
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ private Date createTime;
+
+ /**
+ * 鏇存柊鑰�
+ */
+ private String updateBy;
+
+ /**
+ * 鏇存柊鏃堕棿
+ */
+ private Date updateTime;
+
+ @TableField(exist = false)
+ private static final long serialVersionUID = 1L;
+}
\ No newline at end of file
diff --git a/billion-main/src/main/java/mapper/DaMaterialCollectionMapper.java b/billion-main/src/main/java/mapper/DaMaterialCollectionMapper.java
new file mode 100644
index 0000000..595e081
--- /dev/null
+++ b/billion-main/src/main/java/mapper/DaMaterialCollectionMapper.java
@@ -0,0 +1,18 @@
+package mapper;
+
+import domain.DaMaterialCollection;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author Dell
+* @description 閽堝琛ㄣ�恉a_material_collection(鎷х揣閲囬泦)銆戠殑鏁版嵁搴撴搷浣淢apper
+* @createDate 2024-11-16 10:33:43
+* @Entity generator.domain.DaMaterialCollection
+*/
+public interface DaMaterialCollectionMapper extends BaseMapper<DaMaterialCollection> {
+
+}
+
+
+
+
diff --git a/billion-main/src/main/java/mapper/DaParamCollectionMapper.java b/billion-main/src/main/java/mapper/DaParamCollectionMapper.java
new file mode 100644
index 0000000..8875606
--- /dev/null
+++ b/billion-main/src/main/java/mapper/DaParamCollectionMapper.java
@@ -0,0 +1,18 @@
+package mapper;
+
+import domain.DaParamCollection;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author Dell
+* @description 閽堝琛ㄣ�恉a_param_collection(鍙傛暟閲囬泦)銆戠殑鏁版嵁搴撴搷浣淢apper
+* @createDate 2024-11-16 10:33:43
+* @Entity generator.domain.DaParamCollection
+*/
+public interface DaParamCollectionMapper extends BaseMapper<DaParamCollection> {
+
+}
+
+
+
+
diff --git a/billion-main/src/main/java/mapper/DaStationCollectionMapper.java b/billion-main/src/main/java/mapper/DaStationCollectionMapper.java
new file mode 100644
index 0000000..bdad27c
--- /dev/null
+++ b/billion-main/src/main/java/mapper/DaStationCollectionMapper.java
@@ -0,0 +1,18 @@
+package mapper;
+
+import domain.DaStationCollection;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author Dell
+* @description 閽堝琛ㄣ�恉a_station_collection(杩囩珯閲囬泦)銆戠殑鏁版嵁搴撴搷浣淢apper
+* @createDate 2024-11-16 10:33:43
+* @Entity generator.domain.DaStationCollection
+*/
+public interface DaStationCollectionMapper extends BaseMapper<DaStationCollection> {
+
+}
+
+
+
+
diff --git a/billion-main/src/main/java/mapper/DaTightenCollectionMapper.java b/billion-main/src/main/java/mapper/DaTightenCollectionMapper.java
new file mode 100644
index 0000000..8c7581a
--- /dev/null
+++ b/billion-main/src/main/java/mapper/DaTightenCollectionMapper.java
@@ -0,0 +1,18 @@
+package mapper;
+
+import domain.DaTightenCollection;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author Dell
+* @description 閽堝琛ㄣ�恉a_tighten_collection(鎷х揣閲囬泦)銆戠殑鏁版嵁搴撴搷浣淢apper
+* @createDate 2024-11-16 10:33:43
+* @Entity generator.domain.DaTightenCollection
+*/
+public interface DaTightenCollectionMapper extends BaseMapper<DaTightenCollection> {
+
+}
+
+
+
+
diff --git a/billion-main/src/main/java/mapper/ScCollectionParamConfMapper.java b/billion-main/src/main/java/mapper/ScCollectionParamConfMapper.java
new file mode 100644
index 0000000..f846f12
--- /dev/null
+++ b/billion-main/src/main/java/mapper/ScCollectionParamConfMapper.java
@@ -0,0 +1,18 @@
+package mapper;
+
+import domain.ScCollectionParamConf;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author Dell
+* @description 閽堝琛ㄣ�恠c_collection_param_conf(鍙傛暟閲囬泦閰嶇疆)銆戠殑鏁版嵁搴撴搷浣淢apper
+* @createDate 2024-11-16 10:33:43
+* @Entity generator.domain.ScCollectionParamConf
+*/
+public interface ScCollectionParamConfMapper extends BaseMapper<ScCollectionParamConf> {
+
+}
+
+
+
+
diff --git a/billion-main/src/main/java/service/DaMaterialCollectionService.java b/billion-main/src/main/java/service/DaMaterialCollectionService.java
new file mode 100644
index 0000000..5bb2e3e
--- /dev/null
+++ b/billion-main/src/main/java/service/DaMaterialCollectionService.java
@@ -0,0 +1,13 @@
+package service;
+
+import domain.DaMaterialCollection;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+* @author Dell
+* @description 閽堝琛ㄣ�恉a_material_collection(鎷х揣閲囬泦)銆戠殑鏁版嵁搴撴搷浣淪ervice
+* @createDate 2024-11-16 10:33:43
+*/
+public interface DaMaterialCollectionService extends IService<DaMaterialCollection> {
+
+}
diff --git a/billion-main/src/main/java/service/DaParamCollectionService.java b/billion-main/src/main/java/service/DaParamCollectionService.java
new file mode 100644
index 0000000..e49be02
--- /dev/null
+++ b/billion-main/src/main/java/service/DaParamCollectionService.java
@@ -0,0 +1,13 @@
+package service;
+
+import domain.DaParamCollection;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+* @author Dell
+* @description 閽堝琛ㄣ�恉a_param_collection(鍙傛暟閲囬泦)銆戠殑鏁版嵁搴撴搷浣淪ervice
+* @createDate 2024-11-16 10:33:43
+*/
+public interface DaParamCollectionService extends IService<DaParamCollection> {
+
+}
diff --git a/billion-main/src/main/java/service/DaStationCollectionService.java b/billion-main/src/main/java/service/DaStationCollectionService.java
new file mode 100644
index 0000000..7b403ef
--- /dev/null
+++ b/billion-main/src/main/java/service/DaStationCollectionService.java
@@ -0,0 +1,13 @@
+package service;
+
+import domain.DaStationCollection;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+* @author Dell
+* @description 閽堝琛ㄣ�恉a_station_collection(杩囩珯閲囬泦)銆戠殑鏁版嵁搴撴搷浣淪ervice
+* @createDate 2024-11-16 10:33:43
+*/
+public interface DaStationCollectionService extends IService<DaStationCollection> {
+
+}
diff --git a/billion-main/src/main/java/service/DaTightenCollectionService.java b/billion-main/src/main/java/service/DaTightenCollectionService.java
new file mode 100644
index 0000000..6209854
--- /dev/null
+++ b/billion-main/src/main/java/service/DaTightenCollectionService.java
@@ -0,0 +1,13 @@
+package service;
+
+import domain.DaTightenCollection;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+* @author Dell
+* @description 閽堝琛ㄣ�恉a_tighten_collection(鎷х揣閲囬泦)銆戠殑鏁版嵁搴撴搷浣淪ervice
+* @createDate 2024-11-16 10:33:43
+*/
+public interface DaTightenCollectionService extends IService<DaTightenCollection> {
+
+}
diff --git a/billion-main/src/main/java/service/ScCollectionParamConfService.java b/billion-main/src/main/java/service/ScCollectionParamConfService.java
new file mode 100644
index 0000000..34fed7b
--- /dev/null
+++ b/billion-main/src/main/java/service/ScCollectionParamConfService.java
@@ -0,0 +1,13 @@
+package service;
+
+import domain.ScCollectionParamConf;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+* @author Dell
+* @description 閽堝琛ㄣ�恠c_collection_param_conf(鍙傛暟閲囬泦閰嶇疆)銆戠殑鏁版嵁搴撴搷浣淪ervice
+* @createDate 2024-11-16 10:33:43
+*/
+public interface ScCollectionParamConfService extends IService<ScCollectionParamConf> {
+
+}
diff --git a/billion-main/src/main/java/service/impl/DaMaterialCollectionServiceImpl.java b/billion-main/src/main/java/service/impl/DaMaterialCollectionServiceImpl.java
new file mode 100644
index 0000000..456c7c5
--- /dev/null
+++ b/billion-main/src/main/java/service/impl/DaMaterialCollectionServiceImpl.java
@@ -0,0 +1,23 @@
+package service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import domain.DaMaterialCollection;
+import service.DaMaterialCollectionService;
+import mapper.DaMaterialCollectionMapper;
+import org.springframework.stereotype.Service;
+
+/**
+* @author Dell
+* @description 閽堝琛ㄣ�恉a_material_collection(鎷х揣閲囬泦)銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
+* @createDate 2024-11-16 10:33:43
+*/
+@Service
+public class DaMaterialCollectionServiceImpl extends ServiceImpl<DaMaterialCollectionMapper, DaMaterialCollection>
+ implements DaMaterialCollectionService{
+
+
+}
+
+
+
+
diff --git a/billion-main/src/main/java/service/impl/DaParamCollectionServiceImpl.java b/billion-main/src/main/java/service/impl/DaParamCollectionServiceImpl.java
new file mode 100644
index 0000000..a8dcc4e
--- /dev/null
+++ b/billion-main/src/main/java/service/impl/DaParamCollectionServiceImpl.java
@@ -0,0 +1,22 @@
+package service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import domain.DaParamCollection;
+import service.DaParamCollectionService;
+import mapper.DaParamCollectionMapper;
+import org.springframework.stereotype.Service;
+
+/**
+* @author Dell
+* @description 閽堝琛ㄣ�恉a_param_collection(鍙傛暟閲囬泦)銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
+* @createDate 2024-11-16 10:33:43
+*/
+@Service
+public class DaParamCollectionServiceImpl extends ServiceImpl<DaParamCollectionMapper, DaParamCollection>
+ implements DaParamCollectionService{
+
+}
+
+
+
+
diff --git a/billion-main/src/main/java/service/impl/DaStationCollectionServiceImpl.java b/billion-main/src/main/java/service/impl/DaStationCollectionServiceImpl.java
new file mode 100644
index 0000000..a0462f4
--- /dev/null
+++ b/billion-main/src/main/java/service/impl/DaStationCollectionServiceImpl.java
@@ -0,0 +1,22 @@
+package service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import domain.DaStationCollection;
+import service.DaStationCollectionService;
+import mapper.DaStationCollectionMapper;
+import org.springframework.stereotype.Service;
+
+/**
+* @author Dell
+* @description 閽堝琛ㄣ�恉a_station_collection(杩囩珯閲囬泦)銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
+* @createDate 2024-11-16 10:33:43
+*/
+@Service
+public class DaStationCollectionServiceImpl extends ServiceImpl<DaStationCollectionMapper, DaStationCollection>
+ implements DaStationCollectionService{
+
+}
+
+
+
+
diff --git a/billion-main/src/main/java/service/impl/DaTightenCollectionServiceImpl.java b/billion-main/src/main/java/service/impl/DaTightenCollectionServiceImpl.java
new file mode 100644
index 0000000..cee9c72
--- /dev/null
+++ b/billion-main/src/main/java/service/impl/DaTightenCollectionServiceImpl.java
@@ -0,0 +1,22 @@
+package service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import domain.DaTightenCollection;
+import service.DaTightenCollectionService;
+import mapper.DaTightenCollectionMapper;
+import org.springframework.stereotype.Service;
+
+/**
+* @author Dell
+* @description 閽堝琛ㄣ�恉a_tighten_collection(鎷х揣閲囬泦)銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
+* @createDate 2024-11-16 10:33:43
+*/
+@Service
+public class DaTightenCollectionServiceImpl extends ServiceImpl<DaTightenCollectionMapper, DaTightenCollection>
+ implements DaTightenCollectionService{
+
+}
+
+
+
+
diff --git a/billion-main/src/main/java/service/impl/ScCollectionParamConfServiceImpl.java b/billion-main/src/main/java/service/impl/ScCollectionParamConfServiceImpl.java
new file mode 100644
index 0000000..8a77a86
--- /dev/null
+++ b/billion-main/src/main/java/service/impl/ScCollectionParamConfServiceImpl.java
@@ -0,0 +1,22 @@
+package service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import domain.ScCollectionParamConf;
+import service.ScCollectionParamConfService;
+import mapper.ScCollectionParamConfMapper;
+import org.springframework.stereotype.Service;
+
+/**
+* @author Dell
+* @description 閽堝琛ㄣ�恠c_collection_param_conf(鍙傛暟閲囬泦閰嶇疆)銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
+* @createDate 2024-11-16 10:33:43
+*/
+@Service
+public class ScCollectionParamConfServiceImpl extends ServiceImpl<ScCollectionParamConfMapper, ScCollectionParamConf>
+ implements ScCollectionParamConfService{
+
+}
+
+
+
+
diff --git a/billion-main/src/main/resources/mapper/DaMaterialCollectionMapper.xml b/billion-main/src/main/resources/mapper/DaMaterialCollectionMapper.xml
new file mode 100644
index 0000000..ae12e8e
--- /dev/null
+++ b/billion-main/src/main/resources/mapper/DaMaterialCollectionMapper.xml
@@ -0,0 +1,22 @@
+<?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="mapper.DaMaterialCollectionMapper">
+
+ <resultMap id="BaseResultMap" type="domain.DaMaterialCollection">
+ <id property="id" column="id" jdbcType="BIGINT"/>
+ <result property="sfcCode" column="sfc_code" jdbcType="VARCHAR"/>
+ <result property="locationCode" column="location_code" jdbcType="VARCHAR"/>
+ <result property="paramCode" column="param_code" jdbcType="VARCHAR"/>
+ <result property="paramName" column="param_name" jdbcType="VARCHAR"/>
+ <result property="paramValue" column="param_value" jdbcType="VARCHAR"/>
+ <result property="collectTime" column="collect_time" jdbcType="TIMESTAMP"/>
+ </resultMap>
+
+ <sql id="Base_Column_List">
+ id,sfc_code,location_code,
+ param_code,param_name,param_value,
+ collect_time
+ </sql>
+</mapper>
diff --git a/billion-main/src/main/resources/mapper/DaParamCollectionMapper.xml b/billion-main/src/main/resources/mapper/DaParamCollectionMapper.xml
new file mode 100644
index 0000000..2b2198e
--- /dev/null
+++ b/billion-main/src/main/resources/mapper/DaParamCollectionMapper.xml
@@ -0,0 +1,22 @@
+<?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="mapper.DaParamCollectionMapper">
+
+ <resultMap id="BaseResultMap" type="domain.DaParamCollection">
+ <id property="id" column="id" jdbcType="BIGINT"/>
+ <result property="sfcCode" column="sfc_code" jdbcType="VARCHAR"/>
+ <result property="locationCode" column="location_code" jdbcType="VARCHAR"/>
+ <result property="paramCode" column="param_code" jdbcType="VARCHAR"/>
+ <result property="paramName" column="param_name" jdbcType="VARCHAR"/>
+ <result property="paramValue" column="param_value" jdbcType="VARCHAR"/>
+ <result property="collectTime" column="collect_time" jdbcType="TIMESTAMP"/>
+ </resultMap>
+
+ <sql id="Base_Column_List">
+ id,sfc_code,location_code,
+ param_code,param_name,param_value,
+ collect_time
+ </sql>
+</mapper>
diff --git a/billion-main/src/main/resources/mapper/DaStationCollectionMapper.xml b/billion-main/src/main/resources/mapper/DaStationCollectionMapper.xml
new file mode 100644
index 0000000..04be1dc
--- /dev/null
+++ b/billion-main/src/main/resources/mapper/DaStationCollectionMapper.xml
@@ -0,0 +1,22 @@
+<?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="mapper.DaStationCollectionMapper">
+
+ <resultMap id="BaseResultMap" type="domain.DaStationCollection">
+ <id property="id" column="id" jdbcType="BIGINT"/>
+ <result property="sfcCode" column="sfc_code" jdbcType="VARCHAR"/>
+ <result property="locationCode" column="location_code" jdbcType="VARCHAR"/>
+ <result property="inboundTime" column="inbound_time" jdbcType="TIMESTAMP"/>
+ <result property="outboundTime" column="outbound_time" jdbcType="TIMESTAMP"/>
+ <result property="status" column="status" jdbcType="CHAR"/>
+ <result property="collectTime" column="collect_time" jdbcType="TIMESTAMP"/>
+ </resultMap>
+
+ <sql id="Base_Column_List">
+ id,sfc_code,location_code,
+ inbound_time,outbound_time,status,
+ collect_time
+ </sql>
+</mapper>
diff --git a/billion-main/src/main/resources/mapper/DaTightenCollectionMapper.xml b/billion-main/src/main/resources/mapper/DaTightenCollectionMapper.xml
new file mode 100644
index 0000000..4b872ae
--- /dev/null
+++ b/billion-main/src/main/resources/mapper/DaTightenCollectionMapper.xml
@@ -0,0 +1,26 @@
+<?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="mapper.DaTightenCollectionMapper">
+
+ <resultMap id="BaseResultMap" type="domain.DaTightenCollection">
+ <id property="id" column="id" jdbcType="BIGINT"/>
+ <result property="sfcCode" column="sfc_code" jdbcType="VARCHAR"/>
+ <result property="locationCode" column="location_code" jdbcType="VARCHAR"/>
+ <result property="paramSetCode" column="param_set_code" jdbcType="VARCHAR"/>
+ <result property="paramSetName" column="param_set_name" jdbcType="VARCHAR"/>
+ <result property="torque" column="torque" jdbcType="VARCHAR"/>
+ <result property="torqueStatus" column="torque_status" jdbcType="CHAR"/>
+ <result property="angle" column="angle" jdbcType="VARCHAR"/>
+ <result property="angleStatus" column="angle_status" jdbcType="CHAR"/>
+ <result property="collectTime" column="collect_time" jdbcType="TIMESTAMP"/>
+ </resultMap>
+
+ <sql id="Base_Column_List">
+ id,sfc_code,location_code,
+ param_set_code,param_set_name,torque,
+ torque_status,angle,angle_status,
+ collect_time
+ </sql>
+</mapper>
diff --git a/billion-main/src/main/resources/mapper/ScCollectionParamConfMapper.xml b/billion-main/src/main/resources/mapper/ScCollectionParamConfMapper.xml
new file mode 100644
index 0000000..7de216e
--- /dev/null
+++ b/billion-main/src/main/resources/mapper/ScCollectionParamConfMapper.xml
@@ -0,0 +1,40 @@
+<?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="mapper.ScCollectionParamConfMapper">
+
+ <resultMap id="BaseResultMap" type="domain.ScCollectionParamConf">
+ <id property="id" column="id" jdbcType="BIGINT"/>
+ <result property="productCode" column="product_code" jdbcType="VARCHAR"/>
+ <result property="productType" column="product_type" jdbcType="VARCHAR"/>
+ <result property="locationCode" column="location_code" jdbcType="VARCHAR"/>
+ <result property="paramCode" column="param_code" jdbcType="VARCHAR"/>
+ <result property="paramName" column="param_name" jdbcType="VARCHAR"/>
+ <result property="paramSetCode" column="param_set_code" jdbcType="VARCHAR"/>
+ <result property="paramSetName" column="param_set_name" jdbcType="VARCHAR"/>
+ <result property="node" column="node" jdbcType="VARCHAR"/>
+ <result property="type" column="type" jdbcType="CHAR"/>
+ <result property="unit" column="unit" jdbcType="VARCHAR"/>
+ <result property="paramUpper" column="param_upper" jdbcType="VARCHAR"/>
+ <result property="paramLower" column="param_lower" jdbcType="VARCHAR"/>
+ <result property="paramCentral" column="param_central" jdbcType="VARCHAR"/>
+ <result property="orderNum" column="order_num" jdbcType="INTEGER"/>
+ <result property="subscribe" column="subscribe" jdbcType="CHAR"/>
+ <result property="delFlag" column="del_flag" jdbcType="CHAR"/>
+ <result property="createBy" column="create_by" jdbcType="VARCHAR"/>
+ <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+ <result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
+ <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+ </resultMap>
+
+ <sql id="Base_Column_List">
+ id,product_code,product_type,
+ location_code,param_code,param_name,
+ param_set_code,param_set_name,node,
+ type,unit,param_upper,
+ param_lower,param_central,order_num,
+ subscribe,del_flag,create_by,
+ create_time,update_by,update_time
+ </sql>
+</mapper>
diff --git a/billion-main/src/main/resources/mapper/bs/BsWorkshopMapper.xml b/billion-main/src/main/resources/mapper/bs/BsWorkshopMapper.xml
deleted file mode 100644
index f38f06f..0000000
--- a/billion-main/src/main/resources/mapper/bs/BsWorkshopMapper.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?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.billion.main.bs.workshop.mapper.BsWorkshopMapper">
-
- <resultMap type="BsWorkshop" id="BsWorkshopResult">
- <result property="id" column="id" />
- <result property="workshopCode" column="workshop_code" />
- <result property="workshopName" column="workshop_name" />
- <result property="spareField1" column="spare_field1" />
- <result property="spareField2" column="spare_field2" />
- <result property="remarks" column="remarks" />
- <result property="createBy" column="create_by" />
- <result property="createTime" column="create_time" />
- <result property="updateBy" column="update_by" />
- <result property="updateTime" column="update_time" />
- </resultMap>
-
- <sql id="selectBsWorkshopVo">
- select id, workshop_code, workshop_name, spare_field1, spare_field2, remarks, create_by, create_time, update_by, update_time from bs_workshop
- </sql>
-
- <select id="selectBsWorkshopList" parameterType="BsWorkshop" resultMap="BsWorkshopResult">
- <include refid="selectBsWorkshopVo"/>
- <where>
- <if test="workshopCode != null and workshopCode != ''"> and workshop_code = #{workshopCode}</if>
- <if test="workshopName != null and workshopName != ''"> and workshop_name like concat('%', #{workshopName}, '%')</if>
- </where>
- </select>
-
- <select id="selectBsWorkshopById" parameterType="Long" resultMap="BsWorkshopResult">
- <include refid="selectBsWorkshopVo"/>
- where id = #{id}
- </select>
-
- <insert id="insertBsWorkshop" parameterType="BsWorkshop">
- insert into bs_workshop
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="id != null">id,</if>
- <if test="workshopCode != null">workshop_code,</if>
- <if test="workshopName != null">workshop_name,</if>
- <if test="spareField1 != null">spare_field1,</if>
- <if test="spareField2 != null">spare_field2,</if>
- <if test="remarks != null">remarks,</if>
- <if test="createBy != null">create_by,</if>
- <if test="createTime != null">create_time,</if>
- <if test="updateBy != null">update_by,</if>
- <if test="updateTime != null">update_time,</if>
- </trim>
- <trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="id != null">#{id},</if>
- <if test="workshopCode != null">#{workshopCode},</if>
- <if test="workshopName != null">#{workshopName},</if>
- <if test="spareField1 != null">#{spareField1},</if>
- <if test="spareField2 != null">#{spareField2},</if>
- <if test="remarks != null">#{remarks},</if>
- <if test="createBy != null">#{createBy},</if>
- <if test="createTime != null">#{createTime},</if>
- <if test="updateBy != null">#{updateBy},</if>
- <if test="updateTime != null">#{updateTime},</if>
- </trim>
- </insert>
-
- <update id="updateBsWorkshop" parameterType="BsWorkshop">
- update bs_workshop
- <trim prefix="SET" suffixOverrides=",">
- <if test="workshopCode != null">workshop_code = #{workshopCode},</if>
- <if test="workshopName != null">workshop_name = #{workshopName},</if>
- <if test="spareField1 != null">spare_field1 = #{spareField1},</if>
- <if test="spareField2 != null">spare_field2 = #{spareField2},</if>
- <if test="remarks != null">remarks = #{remarks},</if>
- <if test="createBy != null">create_by = #{createBy},</if>
- <if test="createTime != null">create_time = #{createTime},</if>
- <if test="updateBy != null">update_by = #{updateBy},</if>
- <if test="updateTime != null">update_time = #{updateTime},</if>
- </trim>
- where id = #{id}
- </update>
-
- <delete id="deleteBsWorkshopById" parameterType="Long">
- delete from bs_workshop where id = #{id}
- </delete>
-
- <delete id="deleteBsWorkshopByIds" parameterType="String">
- delete from bs_workshop where id in
- <foreach item="id" collection="array" open="(" separator="," close=")">
- #{id}
- </foreach>
- </delete>
-</mapper>
\ No newline at end of file
--
Gitblit v1.9.3