From a36e52060bf01af842ab66f8b438319d87218087 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期二, 19 十一月 2024 15:57:28 +0800
Subject: [PATCH] 车间
---
billion-main/src/main/java/com/billion/main/service/IBsWorkshopService.java | 64 ++++++++
billion-main/src/main/java/com/billion/main/controller/BsWorkshopController.java | 105 +++++++++++++
billion-main/src/main/java/com/billion/main/mapper/BsWorkshopMapper.java | 64 ++++++++
sql/table.sql | 2
billion-main/src/main/java/com/billion/main/service/impl/BsWorkshopServiceImpl.java | 98 ++++++++++++
billion-main/src/main/java/com/billion/main/service/impl/DaMaterialCollectionServiceImpl.java | 2
billion-main/src/main/resources/mapper/BsWorkshopMapper.xml | 91 +++++++++++
billion-main/src/main/java/com/billion/main/domain/BsWorkshop.java | 41 +++++
8 files changed, 464 insertions(+), 3 deletions(-)
diff --git a/billion-main/src/main/java/com/billion/main/controller/BsWorkshopController.java b/billion-main/src/main/java/com/billion/main/controller/BsWorkshopController.java
new file mode 100644
index 0000000..4d343b2
--- /dev/null
+++ b/billion-main/src/main/java/com/billion/main/controller/BsWorkshopController.java
@@ -0,0 +1,105 @@
+package com.billion.main.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.billion.main.domain.BsWorkshop;
+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.service.IBsWorkshopService;
+import com.billion.common.utils.poi.ExcelUtil;
+import com.billion.common.core.page.TableDataInfo;
+
+/**
+ * 杞﹂棿淇℃伅Controller
+ *
+ * @author Billion-Yi
+ * @date 2024-11-19
+ */
+@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));
+ }
+}
diff --git a/billion-main/src/main/java/com/billion/main/domain/BsWorkshop.java b/billion-main/src/main/java/com/billion/main/domain/BsWorkshop.java
new file mode 100644
index 0000000..71fc505
--- /dev/null
+++ b/billion-main/src/main/java/com/billion/main/domain/BsWorkshop.java
@@ -0,0 +1,41 @@
+package com.billion.main.domain;
+
+import com.billion.common.annotation.Excel;
+import com.billion.common.core.domain.BaseEntity;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 杞﹂棿淇℃伅瀵硅薄 bs_workshop
+ *
+ * @author Billion-Yi
+ * @date 2024-11-19
+ */
+@Data
+public class BsWorkshop extends BaseEntity
+{
+ private static final long serialVersionUID = 1L;
+
+ /** id */
+ private Long id;
+
+ /** 杞﹂棿缂栫爜 */
+ @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/mapper/BsWorkshopMapper.java b/billion-main/src/main/java/com/billion/main/mapper/BsWorkshopMapper.java
new file mode 100644
index 0000000..18088bd
--- /dev/null
+++ b/billion-main/src/main/java/com/billion/main/mapper/BsWorkshopMapper.java
@@ -0,0 +1,64 @@
+package com.billion.main.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.billion.main.domain.BsWorkshop;
+
+import java.util.List;
+
+/**
+ * 杞﹂棿淇℃伅Mapper鎺ュ彛
+ *
+ * @author Billion-Yi
+ * @date 2024-11-19
+ */
+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/service/IBsWorkshopService.java b/billion-main/src/main/java/com/billion/main/service/IBsWorkshopService.java
new file mode 100644
index 0000000..be552d0
--- /dev/null
+++ b/billion-main/src/main/java/com/billion/main/service/IBsWorkshopService.java
@@ -0,0 +1,64 @@
+package com.billion.main.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.billion.main.domain.BsWorkshop;
+
+import java.util.List;
+
+/**
+ * 杞﹂棿淇℃伅Service鎺ュ彛
+ *
+ * @author Billion-Yi
+ * @date 2024-11-19
+ */
+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/service/impl/BsWorkshopServiceImpl.java b/billion-main/src/main/java/com/billion/main/service/impl/BsWorkshopServiceImpl.java
new file mode 100644
index 0000000..b02ce91
--- /dev/null
+++ b/billion-main/src/main/java/com/billion/main/service/impl/BsWorkshopServiceImpl.java
@@ -0,0 +1,98 @@
+package com.billion.main.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.billion.common.utils.DateUtils;
+import com.billion.main.domain.BsWorkshop;
+import com.billion.main.mapper.BsWorkshopMapper;
+import com.billion.main.service.IBsWorkshopService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 杞﹂棿淇℃伅Service涓氬姟灞傚鐞�
+ *
+ * @author Billion-Yi
+ * @date 2024-11-19
+ */
+@Service
+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/com/billion/main/service/impl/DaMaterialCollectionServiceImpl.java b/billion-main/src/main/java/com/billion/main/service/impl/DaMaterialCollectionServiceImpl.java
index 5601bbe..c5494ff 100644
--- a/billion-main/src/main/java/com/billion/main/service/impl/DaMaterialCollectionServiceImpl.java
+++ b/billion-main/src/main/java/com/billion/main/service/impl/DaMaterialCollectionServiceImpl.java
@@ -18,8 +18,6 @@
public class DaMaterialCollectionServiceImpl extends ServiceImpl<DaMaterialCollectionMapper, DaMaterialCollection>
implements DaMaterialCollectionService{
- public R getData(){}
-
}
diff --git a/billion-main/src/main/resources/mapper/BsWorkshopMapper.xml b/billion-main/src/main/resources/mapper/BsWorkshopMapper.xml
new file mode 100644
index 0000000..166a77d
--- /dev/null
+++ b/billion-main/src/main/resources/mapper/BsWorkshopMapper.xml
@@ -0,0 +1,91 @@
+<?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.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_field_1,</if>
+ <if test="spareField2 != null">spare_field_2,</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_field_1 = #{spareField1},</if>
+ <if test="spareField2 != null">spare_field_2 = #{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
diff --git a/sql/table.sql b/sql/table.sql
index 23ee930..89ff4bd 100644
--- a/sql/table.sql
+++ b/sql/table.sql
@@ -20,7 +20,7 @@
-- ----------------------------
-- 2銆佸弬鏁伴噰闆嗛厤缃�
-- ----------------------------
-drop table if exists sc_opc_conf;
+drop table if exists sc_collection_param_conf;
create table sc_collection_param_conf (
id bigint(20) not null auto_increment comment '涓婚敭id',
product_code varchar(64) default '' comment '浜у搧缂栫爜',
--
Gitblit v1.9.3