change - mes模块
yinq
1 year ago
parent
8beb4adab0
commit
3d49b9774d
@ -0,0 +1,28 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<parent>
|
||||
<artifactId>haiwei</artifactId>
|
||||
<groupId>com.haiwei</groupId>
|
||||
<version>3.8.7</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<artifactId>haiwei-mes</artifactId>
|
||||
|
||||
<description>
|
||||
MES模块
|
||||
</description>
|
||||
|
||||
<dependencies>
|
||||
|
||||
<!-- 通用工具-->
|
||||
<dependency>
|
||||
<groupId>com.haiwei</groupId>
|
||||
<artifactId>haiwei-common</artifactId>
|
||||
</dependency>
|
||||
|
||||
</dependencies>
|
||||
|
||||
</project>
|
||||
@ -0,0 +1,106 @@
|
||||
package com.os.mes.base.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.os.common.annotation.Log;
|
||||
import com.os.common.core.controller.BaseController;
|
||||
import com.os.common.core.domain.AjaxResult;
|
||||
import com.os.common.enums.BusinessType;
|
||||
import com.os.mes.base.domain.BaseFactory;
|
||||
import com.os.mes.base.service.IBaseFactoryService;
|
||||
import com.os.common.utils.poi.ExcelUtil;
|
||||
import com.os.common.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 工厂管理Controller
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2024-05-09
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/mes/base/baseFactory")
|
||||
public class BaseFactoryController extends BaseController
|
||||
{
|
||||
@Autowired
|
||||
private IBaseFactoryService baseFactoryService;
|
||||
|
||||
/**
|
||||
* 查询工厂管理列表
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('mes/base:baseFactory:list')")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo list(BaseFactory baseFactory)
|
||||
{
|
||||
startPage();
|
||||
List<BaseFactory> list = baseFactoryService.selectBaseFactoryList(baseFactory);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出工厂管理列表
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('mes/base:baseFactory:export')")
|
||||
@Log(title = "工厂管理", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HttpServletResponse response, BaseFactory baseFactory)
|
||||
{
|
||||
List<BaseFactory> list = baseFactoryService.selectBaseFactoryList(baseFactory);
|
||||
ExcelUtil<BaseFactory> util = new ExcelUtil<BaseFactory>(BaseFactory.class);
|
||||
util.exportExcel(response, list, "工厂管理数据");
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取工厂管理详细信息
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('mes/base:baseFactory:query')")
|
||||
@GetMapping(value = "/{objId}")
|
||||
public AjaxResult getInfo(@PathVariable("objId") Long objId)
|
||||
{
|
||||
return success(baseFactoryService.selectBaseFactoryByObjId(objId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增工厂管理
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('mes/base:baseFactory:add')")
|
||||
@Log(title = "工厂管理", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public AjaxResult add(@RequestBody BaseFactory baseFactory)
|
||||
{
|
||||
baseFactory.setCreateBy(getUsername());
|
||||
return toAjax(baseFactoryService.insertBaseFactory(baseFactory));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改工厂管理
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('mes/base:baseFactory:edit')")
|
||||
@Log(title = "工厂管理", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public AjaxResult edit(@RequestBody BaseFactory baseFactory)
|
||||
{
|
||||
baseFactory.setUpdateBy(getUsername());
|
||||
return toAjax(baseFactoryService.updateBaseFactory(baseFactory));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除工厂管理
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('mes/base:baseFactory:remove')")
|
||||
@Log(title = "工厂管理", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{objIds}")
|
||||
public AjaxResult remove(@PathVariable Long[] objIds)
|
||||
{
|
||||
return toAjax(baseFactoryService.deleteBaseFactoryByObjIds(objIds));
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,61 @@
|
||||
package com.os.mes.base.mapper;
|
||||
|
||||
import java.util.List;
|
||||
import com.os.mes.base.domain.BaseFactory;
|
||||
|
||||
/**
|
||||
* 工厂管理Mapper接口
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2024-05-09
|
||||
*/
|
||||
public interface BaseFactoryMapper
|
||||
{
|
||||
/**
|
||||
* 查询工厂管理
|
||||
*
|
||||
* @param objId 工厂管理主键
|
||||
* @return 工厂管理
|
||||
*/
|
||||
public BaseFactory selectBaseFactoryByObjId(Long objId);
|
||||
|
||||
/**
|
||||
* 查询工厂管理列表
|
||||
*
|
||||
* @param baseFactory 工厂管理
|
||||
* @return 工厂管理集合
|
||||
*/
|
||||
public List<BaseFactory> selectBaseFactoryList(BaseFactory baseFactory);
|
||||
|
||||
/**
|
||||
* 新增工厂管理
|
||||
*
|
||||
* @param baseFactory 工厂管理
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertBaseFactory(BaseFactory baseFactory);
|
||||
|
||||
/**
|
||||
* 修改工厂管理
|
||||
*
|
||||
* @param baseFactory 工厂管理
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateBaseFactory(BaseFactory baseFactory);
|
||||
|
||||
/**
|
||||
* 删除工厂管理
|
||||
*
|
||||
* @param objId 工厂管理主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteBaseFactoryByObjId(Long objId);
|
||||
|
||||
/**
|
||||
* 批量删除工厂管理
|
||||
*
|
||||
* @param objIds 需要删除的数据主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteBaseFactoryByObjIds(Long[] objIds);
|
||||
}
|
||||
@ -0,0 +1,61 @@
|
||||
package com.os.mes.base.service;
|
||||
|
||||
import java.util.List;
|
||||
import com.os.mes.base.domain.BaseFactory;
|
||||
|
||||
/**
|
||||
* 工厂管理Service接口
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2024-05-09
|
||||
*/
|
||||
public interface IBaseFactoryService
|
||||
{
|
||||
/**
|
||||
* 查询工厂管理
|
||||
*
|
||||
* @param objId 工厂管理主键
|
||||
* @return 工厂管理
|
||||
*/
|
||||
public BaseFactory selectBaseFactoryByObjId(Long objId);
|
||||
|
||||
/**
|
||||
* 查询工厂管理列表
|
||||
*
|
||||
* @param baseFactory 工厂管理
|
||||
* @return 工厂管理集合
|
||||
*/
|
||||
public List<BaseFactory> selectBaseFactoryList(BaseFactory baseFactory);
|
||||
|
||||
/**
|
||||
* 新增工厂管理
|
||||
*
|
||||
* @param baseFactory 工厂管理
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertBaseFactory(BaseFactory baseFactory);
|
||||
|
||||
/**
|
||||
* 修改工厂管理
|
||||
*
|
||||
* @param baseFactory 工厂管理
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateBaseFactory(BaseFactory baseFactory);
|
||||
|
||||
/**
|
||||
* 批量删除工厂管理
|
||||
*
|
||||
* @param objIds 需要删除的工厂管理主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteBaseFactoryByObjIds(Long[] objIds);
|
||||
|
||||
/**
|
||||
* 删除工厂管理信息
|
||||
*
|
||||
* @param objId 工厂管理主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteBaseFactoryByObjId(Long objId);
|
||||
}
|
||||
@ -0,0 +1,93 @@
|
||||
package com.os.mes.base.service.impl;
|
||||
|
||||
import java.util.List;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.os.mes.base.mapper.BaseFactoryMapper;
|
||||
import com.os.mes.base.domain.BaseFactory;
|
||||
import com.os.mes.base.service.IBaseFactoryService;
|
||||
|
||||
/**
|
||||
* 工厂管理Service业务层处理
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2024-05-09
|
||||
*/
|
||||
@Service
|
||||
public class BaseFactoryServiceImpl implements IBaseFactoryService
|
||||
{
|
||||
@Autowired
|
||||
private BaseFactoryMapper baseFactoryMapper;
|
||||
|
||||
/**
|
||||
* 查询工厂管理
|
||||
*
|
||||
* @param objId 工厂管理主键
|
||||
* @return 工厂管理
|
||||
*/
|
||||
@Override
|
||||
public BaseFactory selectBaseFactoryByObjId(Long objId)
|
||||
{
|
||||
return baseFactoryMapper.selectBaseFactoryByObjId(objId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询工厂管理列表
|
||||
*
|
||||
* @param baseFactory 工厂管理
|
||||
* @return 工厂管理
|
||||
*/
|
||||
@Override
|
||||
public List<BaseFactory> selectBaseFactoryList(BaseFactory baseFactory)
|
||||
{
|
||||
return baseFactoryMapper.selectBaseFactoryList(baseFactory);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增工厂管理
|
||||
*
|
||||
* @param baseFactory 工厂管理
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int insertBaseFactory(BaseFactory baseFactory)
|
||||
{
|
||||
return baseFactoryMapper.insertBaseFactory(baseFactory);
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改工厂管理
|
||||
*
|
||||
* @param baseFactory 工厂管理
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int updateBaseFactory(BaseFactory baseFactory)
|
||||
{
|
||||
return baseFactoryMapper.updateBaseFactory(baseFactory);
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除工厂管理
|
||||
*
|
||||
* @param objIds 需要删除的工厂管理主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteBaseFactoryByObjIds(Long[] objIds)
|
||||
{
|
||||
return baseFactoryMapper.deleteBaseFactoryByObjIds(objIds);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除工厂管理信息
|
||||
*
|
||||
* @param objId 工厂管理主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteBaseFactoryByObjId(Long objId)
|
||||
{
|
||||
return baseFactoryMapper.deleteBaseFactoryByObjId(objId);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,111 @@
|
||||
<?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.os.mes.base.mapper.BaseFactoryMapper">
|
||||
|
||||
<resultMap type="BaseFactory" id="BaseFactoryResult">
|
||||
<result property="objId" column="obj_id"/>
|
||||
<result property="companyName" column="company_name"/>
|
||||
<result property="factoryCode" column="factory_code"/>
|
||||
<result property="factoryName" column="factory_name"/>
|
||||
<result property="factoryStatus" column="factory_status"/>
|
||||
<result property="remark" column="remark"/>
|
||||
<result property="createdBy" column="created_by"/>
|
||||
<result property="createdTime" column="created_time"/>
|
||||
<result property="updatedBy" column="updated_by"/>
|
||||
<result property="updatedTime" column="updated_time"/>
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectBaseFactoryVo">
|
||||
select obj_id,
|
||||
company_name,
|
||||
factory_code,
|
||||
factory_name,
|
||||
factory_status,
|
||||
remark,
|
||||
created_by,
|
||||
created_time,
|
||||
updated_by,
|
||||
updated_time
|
||||
from base_factory
|
||||
</sql>
|
||||
|
||||
<select id="selectBaseFactoryList" parameterType="BaseFactory" resultMap="BaseFactoryResult">
|
||||
<include refid="selectBaseFactoryVo"/>
|
||||
<where>
|
||||
<if test="companyName != null and companyName != ''">and company_name like concat('%', #{companyName},
|
||||
'%')
|
||||
</if>
|
||||
<if test="factoryCode != null and factoryCode != ''">and factory_code = #{factoryCode}</if>
|
||||
<if test="factoryName != null and factoryName != ''">and factory_name like concat('%', #{factoryName},
|
||||
'%')
|
||||
</if>
|
||||
<if test="factoryStatus != null and factoryStatus != ''">and factory_status = #{factoryStatus}</if>
|
||||
<if test="createdBy != null and createdBy != ''">and created_by = #{createdBy}</if>
|
||||
<if test="createdTime != null ">and created_time = #{createdTime}</if>
|
||||
<if test="updatedBy != null and updatedBy != ''">and updated_by = #{updatedBy}</if>
|
||||
<if test="updatedTime != null ">and updated_time = #{updatedTime}</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<select id="selectBaseFactoryByObjId" parameterType="Long" resultMap="BaseFactoryResult">
|
||||
<include refid="selectBaseFactoryVo"/>
|
||||
where obj_id = #{objId}
|
||||
</select>
|
||||
|
||||
<insert id="insertBaseFactory" parameterType="BaseFactory" useGeneratedKeys="true" keyProperty="objId">
|
||||
insert into base_factory
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="companyName != null">company_name,</if>
|
||||
<if test="factoryCode != null">factory_code,</if>
|
||||
<if test="factoryName != null">factory_name,</if>
|
||||
<if test="factoryStatus != null">factory_status,</if>
|
||||
<if test="remark != null">remark,</if>
|
||||
<if test="createdBy != null">created_by,</if>
|
||||
<if test="createdTime != null">created_time,</if>
|
||||
<if test="updatedBy != null">updated_by,</if>
|
||||
<if test="updatedTime != null">updated_time,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="companyName != null">#{companyName},</if>
|
||||
<if test="factoryCode != null">#{factoryCode},</if>
|
||||
<if test="factoryName != null">#{factoryName},</if>
|
||||
<if test="factoryStatus != null">#{factoryStatus},</if>
|
||||
<if test="remark != null">#{remark},</if>
|
||||
<if test="createdBy != null">#{createdBy},</if>
|
||||
<if test="createdTime != null">#{createdTime},</if>
|
||||
<if test="updatedBy != null">#{updatedBy},</if>
|
||||
<if test="updatedTime != null">#{updatedTime},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateBaseFactory" parameterType="BaseFactory">
|
||||
update base_factory
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="companyName != null">company_name = #{companyName},</if>
|
||||
<if test="factoryCode != null">factory_code = #{factoryCode},</if>
|
||||
<if test="factoryName != null">factory_name = #{factoryName},</if>
|
||||
<if test="factoryStatus != null">factory_status = #{factoryStatus},</if>
|
||||
<if test="remark != null">remark = #{remark},</if>
|
||||
<if test="createdBy != null">created_by = #{createdBy},</if>
|
||||
<if test="createdTime != null">created_time = #{createdTime},</if>
|
||||
<if test="updatedBy != null">updated_by = #{updatedBy},</if>
|
||||
<if test="updatedTime != null">updated_time = #{updatedTime},</if>
|
||||
</trim>
|
||||
where obj_id = #{objId}
|
||||
</update>
|
||||
|
||||
<delete id="deleteBaseFactoryByObjId" parameterType="Long">
|
||||
delete
|
||||
from base_factory
|
||||
where obj_id = #{objId}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteBaseFactoryByObjIds" parameterType="String">
|
||||
delete from base_factory where obj_id in
|
||||
<foreach item="objId" collection="array" open="(" separator="," close=")">
|
||||
#{objId}
|
||||
</foreach>
|
||||
</delete>
|
||||
</mapper>
|
||||
Loading…
Reference in New Issue