From bf64f645a709f2155085b438b6846ec03ccba163 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期日, 04 八月 2024 14:55:24 +0800
Subject: [PATCH] 1P1S配置表代码生成

---
 jcdm-main/src/main/java/com/jcdm/main/da/psConf/controller/DaPsConfController.java    |  104 +++++
 jcdm-main/src/main/java/com/jcdm/main/da/psConf/service/impl/DaPsConfServiceImpl.java |   99 +++++
 jcdm-main/src/main/java/com/jcdm/main/da/psConf/domain/DaPsConf.java                  |  221 ++++++++++++
 jcdm-ui/src/api/main/da/psConf/psConf.js                                              |   44 ++
 jcdm-main/src/main/resources/mapper/da/psConf/DaPsConfMapper.xml                      |  124 ++++++
 jcdm-ui/src/views/main/da/psConf/index.vue                                            |  355 +++++++++++++++++++
 jcdm-main/src/main/java/com/jcdm/main/da/psConf/service/IDaPsConfService.java         |   63 +++
 jcdm-main/src/main/java/com/jcdm/main/da/psConf/mapper/DaPsConfMapper.java            |   63 +++
 8 files changed, 1,073 insertions(+), 0 deletions(-)

diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/psConf/controller/DaPsConfController.java b/jcdm-main/src/main/java/com/jcdm/main/da/psConf/controller/DaPsConfController.java
new file mode 100644
index 0000000..a6c1195
--- /dev/null
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/psConf/controller/DaPsConfController.java
@@ -0,0 +1,104 @@
+package com.jcdm.main.da.psConf.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.jcdm.common.annotation.Log;
+import com.jcdm.common.core.controller.BaseController;
+import com.jcdm.common.core.domain.AjaxResult;
+import com.jcdm.common.enums.BusinessType;
+import com.jcdm.main.da.psConf.domain.DaPsConf;
+import com.jcdm.main.da.psConf.service.IDaPsConfService;
+import com.jcdm.common.utils.poi.ExcelUtil;
+import com.jcdm.common.core.page.TableDataInfo;
+
+/**
+ * 1P1S閰嶇疆Controller
+ * 
+ * @author Yi
+ * @date 2024-08-04
+ */
+@RestController
+@RequestMapping("/da/psConf")
+public class DaPsConfController extends BaseController
+{
+    @Autowired
+    private IDaPsConfService daPsConfService;
+
+    /**
+     * 鏌ヨ1P1S閰嶇疆鍒楄〃
+     */
+    @PreAuthorize("@ss.hasPermi('da:psConf:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(DaPsConf daPsConf)
+    {
+        startPage();
+        List<DaPsConf> list = daPsConfService.selectDaPsConfList(daPsConf);
+        return getDataTable(list);
+    }
+
+    /**
+     * 瀵煎嚭1P1S閰嶇疆鍒楄〃
+     */
+    @PreAuthorize("@ss.hasPermi('da:psConf:export')")
+    @Log(title = "1P1S閰嶇疆", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, DaPsConf daPsConf)
+    {
+        List<DaPsConf> list = daPsConfService.selectDaPsConfList(daPsConf);
+        ExcelUtil<DaPsConf> util = new ExcelUtil<DaPsConf>(DaPsConf.class);
+        util.exportExcel(response, list, "1P1S閰嶇疆鏁版嵁");
+    }
+
+    /**
+     * 鑾峰彇1P1S閰嶇疆璇︾粏淇℃伅
+     */
+    @PreAuthorize("@ss.hasPermi('da:psConf:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(daPsConfService.selectDaPsConfById(id));
+    }
+
+    /**
+     * 鏂板1P1S閰嶇疆
+     */
+    @PreAuthorize("@ss.hasPermi('da:psConf:add')")
+    @Log(title = "1P1S閰嶇疆", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody DaPsConf daPsConf)
+    {
+        return toAjax(daPsConfService.insertDaPsConf(daPsConf));
+    }
+
+    /**
+     * 淇敼1P1S閰嶇疆
+     */
+    @PreAuthorize("@ss.hasPermi('da:psConf:edit')")
+    @Log(title = "1P1S閰嶇疆", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody DaPsConf daPsConf)
+    {
+        return toAjax(daPsConfService.updateDaPsConf(daPsConf));
+    }
+
+    /**
+     * 鍒犻櫎1P1S閰嶇疆
+     */
+    @PreAuthorize("@ss.hasPermi('da:psConf:remove')")
+    @Log(title = "1P1S閰嶇疆", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(daPsConfService.deleteDaPsConfByIds(ids));
+    }
+}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/psConf/domain/DaPsConf.java b/jcdm-main/src/main/java/com/jcdm/main/da/psConf/domain/DaPsConf.java
new file mode 100644
index 0000000..34e7659
--- /dev/null
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/psConf/domain/DaPsConf.java
@@ -0,0 +1,221 @@
+package com.jcdm.main.da.psConf.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.jcdm.common.annotation.Excel;
+import com.jcdm.common.core.domain.BaseEntity;
+
+/**
+ * 1P1S閰嶇疆瀵硅薄 da_ps_conf
+ * 
+ * @author Yi
+ * @date 2024-08-04
+ */
+public class DaPsConf extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 涓婚敭id */
+    private Long id;
+
+    /** 鍘傚晢浠g爜 */
+    @Excel(name = "鍘傚晢浠g爜")
+    private String mfCode;
+
+    /** 浜у搧绫诲瀷浠g爜 */
+    @Excel(name = "浜у搧绫诲瀷浠g爜")
+    private String proTypeCode;
+
+    /** 鐢垫睜绫诲瀷浠g爜 */
+    @Excel(name = "鐢垫睜绫诲瀷浠g爜")
+    private String batteryTypeCode;
+
+    /** 瑙勬牸浠g爜 */
+    @Excel(name = "瑙勬牸浠g爜")
+    private String specificationsCode;
+
+    /** 杩芥函淇℃伅浠g爜 */
+    @Excel(name = "杩芥函淇℃伅浠g爜")
+    private String traceInfoCode;
+
+    /** 鐢熶骇鏃ユ湡浠g爜 */
+    @Excel(name = "鐢熶骇鏃ユ湡浠g爜")
+    private String proDateCode;
+
+    /** 搴忓垪鍙� */
+    @Excel(name = "搴忓垪鍙�")
+    private String sfcCode;
+
+    /** 鐘舵�� (鍚敤enable锛岀鐢╠isable锛� */
+    @Excel(name = "鐘舵�� (鍚敤enable锛岀鐢╠isable锛�")
+    private String state;
+
+    /** 澶囨敞 */
+    @Excel(name = "澶囨敞")
+    private String remarks;
+
+    /** 棰勭暀瀛楁1 */
+    @Excel(name = "棰勭暀瀛楁1")
+    private String spareField1;
+
+    /** 棰勭暀瀛楁2 */
+    @Excel(name = "棰勭暀瀛楁2")
+    private String spareField2;
+
+    /** 鍒涘缓鐢ㄦ埛 */
+    @Excel(name = "鍒涘缓鐢ㄦ埛")
+    private String createUser;
+
+    /** 鏇存敼鐢ㄦ埛 */
+    @Excel(name = "鏇存敼鐢ㄦ埛")
+    private String updateUser;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setMfCode(String mfCode) 
+    {
+        this.mfCode = mfCode;
+    }
+
+    public String getMfCode() 
+    {
+        return mfCode;
+    }
+    public void setProTypeCode(String proTypeCode) 
+    {
+        this.proTypeCode = proTypeCode;
+    }
+
+    public String getProTypeCode() 
+    {
+        return proTypeCode;
+    }
+    public void setBatteryTypeCode(String batteryTypeCode) 
+    {
+        this.batteryTypeCode = batteryTypeCode;
+    }
+
+    public String getBatteryTypeCode() 
+    {
+        return batteryTypeCode;
+    }
+    public void setSpecificationsCode(String specificationsCode) 
+    {
+        this.specificationsCode = specificationsCode;
+    }
+
+    public String getSpecificationsCode() 
+    {
+        return specificationsCode;
+    }
+    public void setTraceInfoCode(String traceInfoCode) 
+    {
+        this.traceInfoCode = traceInfoCode;
+    }
+
+    public String getTraceInfoCode() 
+    {
+        return traceInfoCode;
+    }
+    public void setProDateCode(String proDateCode) 
+    {
+        this.proDateCode = proDateCode;
+    }
+
+    public String getProDateCode() 
+    {
+        return proDateCode;
+    }
+    public void setSfcCode(String sfcCode) 
+    {
+        this.sfcCode = sfcCode;
+    }
+
+    public String getSfcCode() 
+    {
+        return sfcCode;
+    }
+    public void setState(String state) 
+    {
+        this.state = state;
+    }
+
+    public String getState() 
+    {
+        return state;
+    }
+    public void setRemarks(String remarks) 
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks() 
+    {
+        return remarks;
+    }
+    public void setSpareField1(String spareField1) 
+    {
+        this.spareField1 = spareField1;
+    }
+
+    public String getSpareField1() 
+    {
+        return spareField1;
+    }
+    public void setSpareField2(String spareField2) 
+    {
+        this.spareField2 = spareField2;
+    }
+
+    public String getSpareField2() 
+    {
+        return spareField2;
+    }
+    public void setCreateUser(String createUser) 
+    {
+        this.createUser = createUser;
+    }
+
+    public String getCreateUser() 
+    {
+        return createUser;
+    }
+    public void setUpdateUser(String updateUser) 
+    {
+        this.updateUser = updateUser;
+    }
+
+    public String getUpdateUser() 
+    {
+        return updateUser;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("mfCode", getMfCode())
+            .append("proTypeCode", getProTypeCode())
+            .append("batteryTypeCode", getBatteryTypeCode())
+            .append("specificationsCode", getSpecificationsCode())
+            .append("traceInfoCode", getTraceInfoCode())
+            .append("proDateCode", getProDateCode())
+            .append("sfcCode", getSfcCode())
+            .append("state", getState())
+            .append("remarks", getRemarks())
+            .append("spareField1", getSpareField1())
+            .append("spareField2", getSpareField2())
+            .append("createUser", getCreateUser())
+            .append("createTime", getCreateTime())
+            .append("updateUser", getUpdateUser())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/psConf/mapper/DaPsConfMapper.java b/jcdm-main/src/main/java/com/jcdm/main/da/psConf/mapper/DaPsConfMapper.java
new file mode 100644
index 0000000..20a11d3
--- /dev/null
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/psConf/mapper/DaPsConfMapper.java
@@ -0,0 +1,63 @@
+package com.jcdm.main.da.psConf.mapper;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jcdm.main.da.psConf.domain.DaPsConf;
+
+/**
+ * 1P1S閰嶇疆Mapper鎺ュ彛
+ * 
+ * @author Yi
+ * @date 2024-08-04
+ */
+public interface DaPsConfMapper extends BaseMapper<DaPsConf>
+{
+    /**
+     * 鏌ヨ1P1S閰嶇疆
+     * 
+     * @param id 1P1S閰嶇疆涓婚敭
+     * @return 1P1S閰嶇疆
+     */
+    public DaPsConf selectDaPsConfById(Long id);
+
+    /**
+     * 鏌ヨ1P1S閰嶇疆鍒楄〃
+     * 
+     * @param daPsConf 1P1S閰嶇疆
+     * @return 1P1S閰嶇疆闆嗗悎
+     */
+    public List<DaPsConf> selectDaPsConfList(DaPsConf daPsConf);
+
+    /**
+     * 鏂板1P1S閰嶇疆
+     * 
+     * @param daPsConf 1P1S閰嶇疆
+     * @return 缁撴灉
+     */
+    public int insertDaPsConf(DaPsConf daPsConf);
+
+    /**
+     * 淇敼1P1S閰嶇疆
+     * 
+     * @param daPsConf 1P1S閰嶇疆
+     * @return 缁撴灉
+     */
+    public int updateDaPsConf(DaPsConf daPsConf);
+
+    /**
+     * 鍒犻櫎1P1S閰嶇疆
+     * 
+     * @param id 1P1S閰嶇疆涓婚敭
+     * @return 缁撴灉
+     */
+    public int deleteDaPsConfById(Long id);
+
+    /**
+     * 鎵归噺鍒犻櫎1P1S閰嶇疆
+     * 
+     * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+     * @return 缁撴灉
+     */
+    public int deleteDaPsConfByIds(Long[] ids);
+}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/psConf/service/IDaPsConfService.java b/jcdm-main/src/main/java/com/jcdm/main/da/psConf/service/IDaPsConfService.java
new file mode 100644
index 0000000..19b5daf
--- /dev/null
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/psConf/service/IDaPsConfService.java
@@ -0,0 +1,63 @@
+package com.jcdm.main.da.psConf.service;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jcdm.main.da.psConf.domain.DaPsConf;
+
+/**
+ * 1P1S閰嶇疆Service鎺ュ彛
+ * 
+ * @author Yi
+ * @date 2024-08-04
+ */
+public interface IDaPsConfService extends IService<DaPsConf>
+{
+    /**
+     * 鏌ヨ1P1S閰嶇疆
+     * 
+     * @param id 1P1S閰嶇疆涓婚敭
+     * @return 1P1S閰嶇疆
+     */
+    public DaPsConf selectDaPsConfById(Long id);
+
+    /**
+     * 鏌ヨ1P1S閰嶇疆鍒楄〃
+     * 
+     * @param daPsConf 1P1S閰嶇疆
+     * @return 1P1S閰嶇疆闆嗗悎
+     */
+    public List<DaPsConf> selectDaPsConfList(DaPsConf daPsConf);
+
+    /**
+     * 鏂板1P1S閰嶇疆
+     * 
+     * @param daPsConf 1P1S閰嶇疆
+     * @return 缁撴灉
+     */
+    public int insertDaPsConf(DaPsConf daPsConf);
+
+    /**
+     * 淇敼1P1S閰嶇疆
+     * 
+     * @param daPsConf 1P1S閰嶇疆
+     * @return 缁撴灉
+     */
+    public int updateDaPsConf(DaPsConf daPsConf);
+
+    /**
+     * 鎵归噺鍒犻櫎1P1S閰嶇疆
+     * 
+     * @param ids 闇�瑕佸垹闄ょ殑1P1S閰嶇疆涓婚敭闆嗗悎
+     * @return 缁撴灉
+     */
+    public int deleteDaPsConfByIds(Long[] ids);
+
+    /**
+     * 鍒犻櫎1P1S閰嶇疆淇℃伅
+     * 
+     * @param id 1P1S閰嶇疆涓婚敭
+     * @return 缁撴灉
+     */
+    public int deleteDaPsConfById(Long id);
+}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/psConf/service/impl/DaPsConfServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/da/psConf/service/impl/DaPsConfServiceImpl.java
new file mode 100644
index 0000000..e7c29de
--- /dev/null
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/psConf/service/impl/DaPsConfServiceImpl.java
@@ -0,0 +1,99 @@
+package com.jcdm.main.da.psConf.service.impl;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jcdm.common.utils.DateUtils;
+import com.jcdm.main.da.cellData.mapper.DaCellDataMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.jcdm.main.da.psConf.mapper.DaPsConfMapper;
+import com.jcdm.main.da.psConf.domain.DaPsConf;
+import com.jcdm.main.da.psConf.service.IDaPsConfService;
+
+/**
+ * 1P1S閰嶇疆Service涓氬姟灞傚鐞�
+ * 
+ * @author Yi
+ * @date 2024-08-04
+ */
+@Service
+public class DaPsConfServiceImpl extends ServiceImpl<DaPsConfMapper,DaPsConf> implements IDaPsConfService
+{
+    @Autowired
+    private DaPsConfMapper daPsConfMapper;
+
+    /**
+     * 鏌ヨ1P1S閰嶇疆
+     * 
+     * @param id 1P1S閰嶇疆涓婚敭
+     * @return 1P1S閰嶇疆
+     */
+    @Override
+    public DaPsConf selectDaPsConfById(Long id)
+    {
+        return daPsConfMapper.selectDaPsConfById(id);
+    }
+
+    /**
+     * 鏌ヨ1P1S閰嶇疆鍒楄〃
+     * 
+     * @param daPsConf 1P1S閰嶇疆
+     * @return 1P1S閰嶇疆
+     */
+    @Override
+    public List<DaPsConf> selectDaPsConfList(DaPsConf daPsConf)
+    {
+        return daPsConfMapper.selectDaPsConfList(daPsConf);
+    }
+
+    /**
+     * 鏂板1P1S閰嶇疆
+     * 
+     * @param daPsConf 1P1S閰嶇疆
+     * @return 缁撴灉
+     */
+    @Override
+    public int insertDaPsConf(DaPsConf daPsConf)
+    {
+        daPsConf.setCreateTime(DateUtils.getNowDate());
+        return daPsConfMapper.insertDaPsConf(daPsConf);
+    }
+
+    /**
+     * 淇敼1P1S閰嶇疆
+     * 
+     * @param daPsConf 1P1S閰嶇疆
+     * @return 缁撴灉
+     */
+    @Override
+    public int updateDaPsConf(DaPsConf daPsConf)
+    {
+        daPsConf.setUpdateTime(DateUtils.getNowDate());
+        return daPsConfMapper.updateDaPsConf(daPsConf);
+    }
+
+    /**
+     * 鎵归噺鍒犻櫎1P1S閰嶇疆
+     * 
+     * @param ids 闇�瑕佸垹闄ょ殑1P1S閰嶇疆涓婚敭
+     * @return 缁撴灉
+     */
+    @Override
+    public int deleteDaPsConfByIds(Long[] ids)
+    {
+        return daPsConfMapper.deleteDaPsConfByIds(ids);
+    }
+
+    /**
+     * 鍒犻櫎1P1S閰嶇疆淇℃伅
+     * 
+     * @param id 1P1S閰嶇疆涓婚敭
+     * @return 缁撴灉
+     */
+    @Override
+    public int deleteDaPsConfById(Long id)
+    {
+        return daPsConfMapper.deleteDaPsConfById(id);
+    }
+}
diff --git a/jcdm-main/src/main/resources/mapper/da/psConf/DaPsConfMapper.xml b/jcdm-main/src/main/resources/mapper/da/psConf/DaPsConfMapper.xml
new file mode 100644
index 0000000..f0700a0
--- /dev/null
+++ b/jcdm-main/src/main/resources/mapper/da/psConf/DaPsConfMapper.xml
@@ -0,0 +1,124 @@
+<?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.jcdm.main.da.psConf.mapper.DaPsConfMapper">
+    
+    <resultMap type="DaPsConf" id="DaPsConfResult">
+        <result property="id"    column="id"    />
+        <result property="mfCode"    column="mf_code"    />
+        <result property="proTypeCode"    column="pro_type_code"    />
+        <result property="batteryTypeCode"    column="battery_type_code"    />
+        <result property="specificationsCode"    column="specifications_code"    />
+        <result property="traceInfoCode"    column="trace_info_code"    />
+        <result property="proDateCode"    column="pro_date_code"    />
+        <result property="sfcCode"    column="sfc_code"    />
+        <result property="state"    column="state"    />
+        <result property="remarks"    column="remarks"    />
+        <result property="spareField1"    column="spare_field1"    />
+        <result property="spareField2"    column="spare_field2"    />
+        <result property="createUser"    column="create_user"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateUser"    column="update_user"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectDaPsConfVo">
+        select id, mf_code, pro_type_code, battery_type_code, specifications_code, trace_info_code, pro_date_code, sfc_code, state, remarks, spare_field1, spare_field2, create_user, create_time, update_user, update_time from da_ps_conf
+    </sql>
+
+    <select id="selectDaPsConfList" parameterType="DaPsConf" resultMap="DaPsConfResult">
+        <include refid="selectDaPsConfVo"/>
+        <where>  
+            <if test="mfCode != null  and mfCode != ''"> and mf_code = #{mfCode}</if>
+            <if test="proTypeCode != null  and proTypeCode != ''"> and pro_type_code = #{proTypeCode}</if>
+            <if test="batteryTypeCode != null  and batteryTypeCode != ''"> and battery_type_code = #{batteryTypeCode}</if>
+            <if test="specificationsCode != null  and specificationsCode != ''"> and specifications_code = #{specificationsCode}</if>
+            <if test="traceInfoCode != null  and traceInfoCode != ''"> and trace_info_code = #{traceInfoCode}</if>
+            <if test="proDateCode != null  and proDateCode != ''"> and pro_date_code = #{proDateCode}</if>
+            <if test="sfcCode != null  and sfcCode != ''"> and sfc_code = #{sfcCode}</if>
+            <if test="state != null  and state != ''"> and state = #{state}</if>
+            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="spareField1 != null  and spareField1 != ''"> and spare_field1 = #{spareField1}</if>
+            <if test="spareField2 != null  and spareField2 != ''"> and spare_field2 = #{spareField2}</if>
+            <if test="createUser != null  and createUser != ''"> and create_user = #{createUser}</if>
+            <if test="updateUser != null  and updateUser != ''"> and update_user = #{updateUser}</if>
+        </where>
+    </select>
+    
+    <select id="selectDaPsConfById" parameterType="Long" resultMap="DaPsConfResult">
+        <include refid="selectDaPsConfVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertDaPsConf" parameterType="DaPsConf" useGeneratedKeys="true" keyProperty="id">
+        insert into da_ps_conf
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="mfCode != null">mf_code,</if>
+            <if test="proTypeCode != null">pro_type_code,</if>
+            <if test="batteryTypeCode != null">battery_type_code,</if>
+            <if test="specificationsCode != null">specifications_code,</if>
+            <if test="traceInfoCode != null">trace_info_code,</if>
+            <if test="proDateCode != null">pro_date_code,</if>
+            <if test="sfcCode != null">sfc_code,</if>
+            <if test="state != null">state,</if>
+            <if test="remarks != null">remarks,</if>
+            <if test="spareField1 != null">spare_field1,</if>
+            <if test="spareField2 != null">spare_field2,</if>
+            <if test="createUser != null">create_user,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateUser != null">update_user,</if>
+            <if test="updateTime != null">update_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="mfCode != null">#{mfCode},</if>
+            <if test="proTypeCode != null">#{proTypeCode},</if>
+            <if test="batteryTypeCode != null">#{batteryTypeCode},</if>
+            <if test="specificationsCode != null">#{specificationsCode},</if>
+            <if test="traceInfoCode != null">#{traceInfoCode},</if>
+            <if test="proDateCode != null">#{proDateCode},</if>
+            <if test="sfcCode != null">#{sfcCode},</if>
+            <if test="state != null">#{state},</if>
+            <if test="remarks != null">#{remarks},</if>
+            <if test="spareField1 != null">#{spareField1},</if>
+            <if test="spareField2 != null">#{spareField2},</if>
+            <if test="createUser != null">#{createUser},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateUser != null">#{updateUser},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateDaPsConf" parameterType="DaPsConf">
+        update da_ps_conf
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="mfCode != null">mf_code = #{mfCode},</if>
+            <if test="proTypeCode != null">pro_type_code = #{proTypeCode},</if>
+            <if test="batteryTypeCode != null">battery_type_code = #{batteryTypeCode},</if>
+            <if test="specificationsCode != null">specifications_code = #{specificationsCode},</if>
+            <if test="traceInfoCode != null">trace_info_code = #{traceInfoCode},</if>
+            <if test="proDateCode != null">pro_date_code = #{proDateCode},</if>
+            <if test="sfcCode != null">sfc_code = #{sfcCode},</if>
+            <if test="state != null">state = #{state},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="spareField1 != null">spare_field1 = #{spareField1},</if>
+            <if test="spareField2 != null">spare_field2 = #{spareField2},</if>
+            <if test="createUser != null">create_user = #{createUser},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateUser != null">update_user = #{updateUser},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteDaPsConfById" parameterType="Long">
+        delete from da_ps_conf where id = #{id}
+    </delete>
+
+    <delete id="deleteDaPsConfByIds" parameterType="String">
+        delete from da_ps_conf where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/jcdm-ui/src/api/main/da/psConf/psConf.js b/jcdm-ui/src/api/main/da/psConf/psConf.js
new file mode 100644
index 0000000..ebc035d
--- /dev/null
+++ b/jcdm-ui/src/api/main/da/psConf/psConf.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 鏌ヨ1P1S閰嶇疆鍒楄〃
+export function listPsConf(query) {
+  return request({
+    url: '/da/psConf/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 鏌ヨ1P1S閰嶇疆璇︾粏
+export function getPsConf(id) {
+  return request({
+    url: '/da/psConf/' + id,
+    method: 'get'
+  })
+}
+
+// 鏂板1P1S閰嶇疆
+export function addPsConf(data) {
+  return request({
+    url: '/da/psConf',
+    method: 'post',
+    data: data
+  })
+}
+
+// 淇敼1P1S閰嶇疆
+export function updatePsConf(data) {
+  return request({
+    url: '/da/psConf',
+    method: 'put',
+    data: data
+  })
+}
+
+// 鍒犻櫎1P1S閰嶇疆
+export function delPsConf(id) {
+  return request({
+    url: '/da/psConf/' + id,
+    method: 'delete'
+  })
+}
diff --git a/jcdm-ui/src/views/main/da/psConf/index.vue b/jcdm-ui/src/views/main/da/psConf/index.vue
new file mode 100644
index 0000000..ed42a39
--- /dev/null
+++ b/jcdm-ui/src/views/main/da/psConf/index.vue
@@ -0,0 +1,355 @@
+<template>
+  <div class="app-container">
+    <el-card class="box-card">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+          <el-form-item label="鍘傚晢浠g爜" prop="mfCode">
+            <el-input
+              v-model="queryParams.mfCode"
+              placeholder="璇疯緭鍏ュ巶鍟嗕唬鐮�"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="浜у搧绫诲瀷浠g爜" prop="proTypeCode">
+            <el-input
+              v-model="queryParams.proTypeCode"
+              placeholder="璇疯緭鍏ヤ骇鍝佺被鍨嬩唬鐮�"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item style="float: right">
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+          </el-form-item>
+        </el-form>
+    </el-card>
+
+    <el-card style="margin-top: 10px" class="box-card">
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button
+              type="primary"
+              plain
+              icon="el-icon-plus"
+              size="mini"
+              @click="handleAdd"
+              v-hasPermi="['da:psConf:add']"
+            >鏂板</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="success"
+              plain
+              icon="el-icon-edit"
+              size="mini"
+              :disabled="single"
+              @click="handleUpdate"
+              v-hasPermi="['da:psConf:edit']"
+            >淇敼</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="danger"
+              plain
+              icon="el-icon-delete"
+              size="mini"
+              :disabled="multiple"
+              @click="handleDelete"
+              v-hasPermi="['da:psConf:remove']"
+            >鍒犻櫎</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="warning"
+              plain
+              icon="el-icon-download"
+              size="mini"
+              @click="handleExport"
+              v-hasPermi="['da:psConf:export']"
+            >瀵煎嚭</el-button>
+          </el-col>
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+
+        <el-table border v-loading="loading" :data="psConfList" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="鍘傚晢浠g爜" align="center" prop="mfCode">
+          </el-table-column>
+          <el-table-column label="浜у搧绫诲瀷浠g爜" align="center" prop="proTypeCode">
+          </el-table-column>
+          <el-table-column label="鐢垫睜绫诲瀷浠g爜" align="center" prop="batteryTypeCode">
+          </el-table-column>
+          <el-table-column label="瑙勬牸浠g爜" align="center" prop="specificationsCode">
+          </el-table-column>
+          <el-table-column label="杩芥函淇℃伅浠g爜" align="center" prop="traceInfoCode">
+          </el-table-column>
+          <el-table-column label="鐢熶骇鏃ユ湡浠g爜" align="center" prop="proDateCode">
+          </el-table-column>
+          <el-table-column label="搴忓垪鍙�" align="center" prop="sfcCode">
+          </el-table-column>
+          <el-table-column label="鐘舵�� (鍚敤enable锛岀鐢╠isable锛�" align="center" prop="state">
+          </el-table-column>
+          <el-table-column label="澶囨敞" align="center" prop="remarks">
+          </el-table-column>
+          <el-table-column label="棰勭暀瀛楁1" align="center" prop="spareField1">
+          </el-table-column>
+          <el-table-column label="棰勭暀瀛楁2" align="center" prop="spareField2">
+          </el-table-column>
+          <el-table-column label="鍒涘缓鐢ㄦ埛" align="center" prop="createUser">
+          </el-table-column>
+          <el-table-column label="鏇存敼鐢ㄦ埛" align="center" prop="updateUser">
+          </el-table-column>
+          <el-table-column fixed="right" width="200" label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="success"
+                plain
+                style="width: 72px"
+                icon="el-icon-edit"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="['da:psConf:edit']"
+              >淇敼</el-button>
+              <el-button
+                size="mini"
+                type="danger"
+                plain
+                style="width: 72px"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['da:psConf:remove']"
+              >鍒犻櫎</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+    </el-card>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 娣诲姞鎴栦慨鏀�1P1S閰嶇疆瀵硅瘽妗� -->
+    <el-dialog v-dialogpop-up :title="title" :visible.sync="open" width="500px" append-to-body>
+      <span slot="title">
+        <i class="el-icon-s-order"></i>
+        {{titleName}}
+      </span>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="鍘傚晢浠g爜" prop="mfCode">
+          <el-input v-model="form.mfCode" placeholder="璇疯緭鍏ュ巶鍟嗕唬鐮�" />
+        </el-form-item>
+        <el-form-item label="浜у搧绫诲瀷浠g爜" prop="proTypeCode">
+          <el-input v-model="form.proTypeCode" placeholder="璇疯緭鍏ヤ骇鍝佺被鍨嬩唬鐮�" />
+        </el-form-item>
+        <el-form-item label="鐢垫睜绫诲瀷浠g爜" prop="batteryTypeCode">
+          <el-input v-model="form.batteryTypeCode" placeholder="璇疯緭鍏ョ數姹犵被鍨嬩唬鐮�" />
+        </el-form-item>
+        <el-form-item label="瑙勬牸浠g爜" prop="specificationsCode">
+          <el-input v-model="form.specificationsCode" placeholder="璇疯緭鍏ヨ鏍间唬鐮�" />
+        </el-form-item>
+        <el-form-item label="杩芥函淇℃伅浠g爜" prop="traceInfoCode">
+          <el-input v-model="form.traceInfoCode" placeholder="璇疯緭鍏ヨ拷婧俊鎭唬鐮�" />
+        </el-form-item>
+        <el-form-item label="鐢熶骇鏃ユ湡浠g爜" prop="proDateCode">
+          <el-input v-model="form.proDateCode" placeholder="璇疯緭鍏ョ敓浜ф棩鏈熶唬鐮�" />
+        </el-form-item>
+        <el-form-item label="搴忓垪鍙�" prop="sfcCode">
+          <el-input v-model="form.sfcCode" placeholder="璇疯緭鍏ュ簭鍒楀彿" />
+        </el-form-item>
+        <el-form-item label="鐘舵�� (鍚敤enable锛岀鐢╠isable锛�" prop="state">
+          <el-input v-model="form.state" placeholder="璇疯緭鍏ョ姸鎬� (鍚敤enable锛岀鐢╠isable锛�" />
+        </el-form-item>
+        <el-form-item label="澶囨敞" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="璇疯緭鍏ュ娉�" />
+        </el-form-item>
+        <el-form-item label="棰勭暀瀛楁1" prop="spareField1">
+          <el-input v-model="form.spareField1" placeholder="璇疯緭鍏ラ鐣欏瓧娈�1" />
+        </el-form-item>
+        <el-form-item label="棰勭暀瀛楁2" prop="spareField2">
+          <el-input v-model="form.spareField2" placeholder="璇疯緭鍏ラ鐣欏瓧娈�2" />
+        </el-form-item>
+        <el-form-item label="鍒涘缓鐢ㄦ埛" prop="createUser">
+          <el-input v-model="form.createUser" placeholder="璇疯緭鍏ュ垱寤虹敤鎴�" />
+        </el-form-item>
+        <el-form-item label="鏇存敼鐢ㄦ埛" prop="updateUser">
+          <el-input v-model="form.updateUser" placeholder="璇疯緭鍏ユ洿鏀圭敤鎴�" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
+        <el-button @click="cancel">鍙� 娑�</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listPsConf, getPsConf, delPsConf, addPsConf, updatePsConf } from "@/api/main/da/psConf/psConf";
+
+export default {
+  name: "PsConf",
+  data() {
+    return {
+      // 閬僵灞�
+      loading: true,
+      titleName: "",
+      // 閫変腑鏁扮粍
+      ids: [],
+      // 闈炲崟涓鐢�
+      single: true,
+      // 闈炲涓鐢�
+      multiple: true,
+      // 鏄剧ず鎼滅储鏉′欢
+      showSearch: true,
+      // 鎬绘潯鏁�
+      total: 0,
+      // 1P1S閰嶇疆琛ㄦ牸鏁版嵁
+      psConfList: [],
+      // 寮瑰嚭灞傛爣棰�
+      title: "",
+      // 鏄惁鏄剧ず寮瑰嚭灞�
+      open: false,
+      // 鏌ヨ鍙傛暟
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        mfCode: null,
+        proTypeCode: null,
+        batteryTypeCode: null,
+        specificationsCode: null,
+        traceInfoCode: null,
+        proDateCode: null,
+        sfcCode: null,
+        state: null,
+        remarks: null,
+        spareField1: null,
+        spareField2: null,
+        createUser: null,
+        updateUser: null,
+      },
+      // 琛ㄥ崟鍙傛暟
+      form: {},
+      // 琛ㄥ崟鏍¢獙
+      rules: {
+        id: [
+          { required: true, message: "涓婚敭id涓嶈兘涓虹┖", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 鏌ヨ1P1S閰嶇疆鍒楄〃 */
+    getList() {
+      this.loading = true;
+      listPsConf(this.queryParams).then(response => {
+        this.psConfList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 鍙栨秷鎸夐挳
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 琛ㄥ崟閲嶇疆
+    reset() {
+      this.form = {
+        id: null,
+        mfCode: null,
+        proTypeCode: null,
+        batteryTypeCode: null,
+        specificationsCode: null,
+        traceInfoCode: null,
+        proDateCode: null,
+        sfcCode: null,
+        state: null,
+        remarks: null,
+        spareField1: null,
+        spareField2: null,
+        createUser: null,
+        createTime: null,
+        updateUser: null,
+        updateTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 鎼滅储鎸夐挳鎿嶄綔 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 閲嶇疆鎸夐挳鎿嶄綔 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 澶氶�夋閫変腑鏁版嵁
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 鏂板鎸夐挳鎿嶄綔 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.titleName = "娣诲姞1P1S閰嶇疆";
+    },
+    /** 淇敼鎸夐挳鎿嶄綔 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getPsConf(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.titleName = "淇敼1P1S閰嶇疆";
+      });
+    },
+    /** 鎻愪氦鎸夐挳 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updatePsConf(this.form).then(response => {
+              this.$modal.msgSuccess("淇敼鎴愬姛");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addPsConf(this.form).then(response => {
+              this.$modal.msgSuccess("鏂板鎴愬姛");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 鍒犻櫎鎸夐挳鎿嶄綔 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('鏄惁纭鍒犻櫎1P1S閰嶇疆缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function() {
+        return delPsConf(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+      }).catch(() => {});
+    },
+    /** 瀵煎嚭鎸夐挳鎿嶄綔 */
+    handleExport() {
+      this.download('da/psConf/export', {
+        ...this.queryParams
+      }, `psConf_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

--
Gitblit v1.9.3