Merge branch 'master' of http://112.4.208.194:3000/FeiDaBaoKai/wms_serve_xugongteji
This commit is contained in:
commit
cad2b54285
|
|
@ -2,11 +2,6 @@ package com.ruoyi.web.controller.app;
|
|||
|
||||
import java.util.List;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import com.ruoyi.app.domain.AppGoodsPair;
|
||||
import com.ruoyi.app.domain.AppLedConfig;
|
||||
import com.ruoyi.app.service.IAppLedConfigService;
|
||||
import com.ruoyi.web.controller.section.EnhanceDataList;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
|
|
@ -21,28 +16,29 @@ import com.ruoyi.common.annotation.Log;
|
|||
import com.ruoyi.common.core.controller.BaseController;
|
||||
import com.ruoyi.common.core.domain.AjaxResult;
|
||||
import com.ruoyi.common.enums.BusinessType;
|
||||
import com.ruoyi.app.domain.AppLedConfig;
|
||||
import com.ruoyi.app.service.IAppLedConfigService;
|
||||
import com.ruoyi.common.utils.poi.ExcelUtil;
|
||||
import com.ruoyi.common.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 【请填写功能名称】Controller
|
||||
* led显示屏设置Controller
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-01-15
|
||||
* @date 2025-03-07
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/app/led")
|
||||
@RequestMapping("/app/ledconfig")
|
||||
public class AppLedConfigController extends BaseController
|
||||
{
|
||||
@Autowired
|
||||
private IAppLedConfigService appLedConfigService;
|
||||
|
||||
/**
|
||||
* 查询【请填写功能名称】列表
|
||||
* 查询led显示屏设置列表
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('system:config:list')")
|
||||
@PreAuthorize("@ss.hasPermi('app:ledconfig:list')")
|
||||
@GetMapping("/list")
|
||||
@EnhanceDataList(entityType = AppLedConfig.class)
|
||||
public TableDataInfo list(AppLedConfig appLedConfig)
|
||||
{
|
||||
startPage();
|
||||
|
|
@ -51,33 +47,33 @@ public class AppLedConfigController extends BaseController
|
|||
}
|
||||
|
||||
/**
|
||||
* 导出【请填写功能名称】列表
|
||||
* 导出led显示屏设置列表
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('system:config:export')")
|
||||
@Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
|
||||
@PreAuthorize("@ss.hasPermi('app:ledconfig:export')")
|
||||
@Log(title = "led显示屏设置", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HttpServletResponse response, AppLedConfig appLedConfig)
|
||||
{
|
||||
List<AppLedConfig> list = appLedConfigService.selectAppLedConfigList(appLedConfig);
|
||||
ExcelUtil<AppLedConfig> util = new ExcelUtil<AppLedConfig>(AppLedConfig.class);
|
||||
util.exportExcel(response, list, "【请填写功能名称】数据");
|
||||
util.exportExcel(response, list, "led显示屏设置数据");
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取【请填写功能名称】详细信息
|
||||
* 获取led显示屏设置详细信息
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('system:config:query')")
|
||||
@GetMapping(value = "/{ledId}")
|
||||
public AjaxResult getInfo(@PathVariable("ledId") String ledId)
|
||||
@PreAuthorize("@ss.hasPermi('app:ledconfig:query')")
|
||||
@GetMapping(value = "/{id}")
|
||||
public AjaxResult getInfo(@PathVariable("id") String id)
|
||||
{
|
||||
return success(appLedConfigService.selectAppLedConfigByLedId(ledId));
|
||||
return success(appLedConfigService.selectAppLedConfigById(id));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增【请填写功能名称】
|
||||
* 新增led显示屏设置
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('system:config:add')")
|
||||
@Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
|
||||
@PreAuthorize("@ss.hasPermi('app:ledconfig:add')")
|
||||
@Log(title = "led显示屏设置", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public AjaxResult add(@RequestBody AppLedConfig appLedConfig)
|
||||
{
|
||||
|
|
@ -85,10 +81,10 @@ public class AppLedConfigController extends BaseController
|
|||
}
|
||||
|
||||
/**
|
||||
* 修改【请填写功能名称】
|
||||
* 修改led显示屏设置
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('system:config:edit')")
|
||||
@Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
|
||||
@PreAuthorize("@ss.hasPermi('app:ledconfig:edit')")
|
||||
@Log(title = "led显示屏设置", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public AjaxResult edit(@RequestBody AppLedConfig appLedConfig)
|
||||
{
|
||||
|
|
@ -96,13 +92,13 @@ public class AppLedConfigController extends BaseController
|
|||
}
|
||||
|
||||
/**
|
||||
* 删除【请填写功能名称】
|
||||
* 删除led显示屏设置
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('system:config:remove')")
|
||||
@Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ledIds}")
|
||||
public AjaxResult remove(@PathVariable String[] ledIds)
|
||||
@PreAuthorize("@ss.hasPermi('app:ledconfig:remove')")
|
||||
@Log(title = "led显示屏设置", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public AjaxResult remove(@PathVariable String[] ids)
|
||||
{
|
||||
return toAjax(appLedConfigService.deleteAppLedConfigByLedIds(ledIds));
|
||||
return toAjax(appLedConfigService.deleteAppLedConfigByIds(ids));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,38 +1,263 @@
|
|||
package com.ruoyi.app.domain;
|
||||
|
||||
import com.ruoyi.common.annotation.Excel;
|
||||
import java.math.BigDecimal;
|
||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||
import com.ruoyi.common.annotation.Excel;
|
||||
import com.ruoyi.common.core.domain.BaseEntity;
|
||||
|
||||
/**
|
||||
* 【请填写功能名称】对象 app_led_config
|
||||
* led显示屏设置对象 app_led_config
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-01-14
|
||||
* @date 2025-03-07
|
||||
*/
|
||||
public class AppLedConfig extends BaseEntity
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** 主键 */
|
||||
@Excel(name = "主键")
|
||||
private String ledId;
|
||||
private String id;
|
||||
|
||||
public void setLedId(String ledId)
|
||||
/** 屏类别 1:分拣屏 */
|
||||
@Excel(name = "屏类别 1:分拣屏")
|
||||
private String sType;
|
||||
|
||||
/** 屏编码 */
|
||||
@Excel(name = "屏编码")
|
||||
private String sCode;
|
||||
|
||||
/** 屏IP地址 */
|
||||
@Excel(name = "屏IP地址")
|
||||
private String sIp;
|
||||
|
||||
/** 屏1内容 */
|
||||
@Excel(name = "屏1内容")
|
||||
private String sOneContent;
|
||||
|
||||
/** 屏2内容 */
|
||||
@Excel(name = "屏2内容")
|
||||
private String sTwoContent;
|
||||
|
||||
/** $column.columnComment */
|
||||
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
|
||||
private String sThreeContent;
|
||||
|
||||
/** $column.columnComment */
|
||||
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
|
||||
private String sFourContent;
|
||||
|
||||
/** 物料编码 */
|
||||
@Excel(name = "物料编码")
|
||||
private String goodsId;
|
||||
|
||||
/** 消息内容 */
|
||||
@Excel(name = "消息内容")
|
||||
private String messageContent;
|
||||
|
||||
/** 数量 */
|
||||
@Excel(name = "数量")
|
||||
private BigDecimal quantity;
|
||||
|
||||
/** 单位 */
|
||||
@Excel(name = "单位")
|
||||
private String unit;
|
||||
|
||||
/** 产线 */
|
||||
@Excel(name = "产线")
|
||||
private String productLine;
|
||||
|
||||
/** 工位 */
|
||||
@Excel(name = "工位")
|
||||
private String station;
|
||||
|
||||
/** 配盘点 */
|
||||
@Excel(name = "配盘点")
|
||||
private String inventoryPosition;
|
||||
|
||||
/** 状态 */
|
||||
@Excel(name = "状态")
|
||||
private String goodsStatus;
|
||||
|
||||
/** 显示状态 */
|
||||
@Excel(name = "显示状态")
|
||||
private String sStatus;
|
||||
|
||||
public void setId(String id)
|
||||
{
|
||||
this.ledId = ledId;
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getLedId()
|
||||
public String getId()
|
||||
{
|
||||
return ledId;
|
||||
return id;
|
||||
}
|
||||
public void setsType(String sType)
|
||||
{
|
||||
this.sType = sType;
|
||||
}
|
||||
|
||||
public String getsType()
|
||||
{
|
||||
return sType;
|
||||
}
|
||||
public void setsCode(String sCode)
|
||||
{
|
||||
this.sCode = sCode;
|
||||
}
|
||||
|
||||
public String getsCode()
|
||||
{
|
||||
return sCode;
|
||||
}
|
||||
public void setsIp(String sIp)
|
||||
{
|
||||
this.sIp = sIp;
|
||||
}
|
||||
|
||||
public String getsIp()
|
||||
{
|
||||
return sIp;
|
||||
}
|
||||
public void setsOneContent(String sOneContent)
|
||||
{
|
||||
this.sOneContent = sOneContent;
|
||||
}
|
||||
|
||||
public String getsOneContent()
|
||||
{
|
||||
return sOneContent;
|
||||
}
|
||||
public void setsTwoContent(String sTwoContent)
|
||||
{
|
||||
this.sTwoContent = sTwoContent;
|
||||
}
|
||||
|
||||
public String getsTwoContent()
|
||||
{
|
||||
return sTwoContent;
|
||||
}
|
||||
public void setsThreeContent(String sThreeContent)
|
||||
{
|
||||
this.sThreeContent = sThreeContent;
|
||||
}
|
||||
|
||||
public String getsThreeContent()
|
||||
{
|
||||
return sThreeContent;
|
||||
}
|
||||
public void setsFourContent(String sFourContent)
|
||||
{
|
||||
this.sFourContent = sFourContent;
|
||||
}
|
||||
|
||||
public String getsFourContent()
|
||||
{
|
||||
return sFourContent;
|
||||
}
|
||||
public void setGoodsId(String goodsId)
|
||||
{
|
||||
this.goodsId = goodsId;
|
||||
}
|
||||
|
||||
public String getGoodsId()
|
||||
{
|
||||
return goodsId;
|
||||
}
|
||||
public void setMessageContent(String messageContent)
|
||||
{
|
||||
this.messageContent = messageContent;
|
||||
}
|
||||
|
||||
public String getMessageContent()
|
||||
{
|
||||
return messageContent;
|
||||
}
|
||||
public void setQuantity(BigDecimal quantity)
|
||||
{
|
||||
this.quantity = quantity;
|
||||
}
|
||||
|
||||
public BigDecimal getQuantity()
|
||||
{
|
||||
return quantity;
|
||||
}
|
||||
public void setUnit(String unit)
|
||||
{
|
||||
this.unit = unit;
|
||||
}
|
||||
|
||||
public String getUnit()
|
||||
{
|
||||
return unit;
|
||||
}
|
||||
public void setProductLine(String productLine)
|
||||
{
|
||||
this.productLine = productLine;
|
||||
}
|
||||
|
||||
public String getProductLine()
|
||||
{
|
||||
return productLine;
|
||||
}
|
||||
public void setStation(String station)
|
||||
{
|
||||
this.station = station;
|
||||
}
|
||||
|
||||
public String getStation()
|
||||
{
|
||||
return station;
|
||||
}
|
||||
public void setInventoryPosition(String inventoryPosition)
|
||||
{
|
||||
this.inventoryPosition = inventoryPosition;
|
||||
}
|
||||
|
||||
public String getInventoryPosition()
|
||||
{
|
||||
return inventoryPosition;
|
||||
}
|
||||
public void setGoodsStatus(String goodsStatus)
|
||||
{
|
||||
this.goodsStatus = goodsStatus;
|
||||
}
|
||||
|
||||
public String getGoodsStatus()
|
||||
{
|
||||
return goodsStatus;
|
||||
}
|
||||
public void setsStatus(String sStatus)
|
||||
{
|
||||
this.sStatus = sStatus;
|
||||
}
|
||||
|
||||
public String getsStatus()
|
||||
{
|
||||
return sStatus;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||
.append("ledId", getLedId())
|
||||
.toString();
|
||||
.append("id", getId())
|
||||
.append("sType", getsType())
|
||||
.append("sCode", getsCode())
|
||||
.append("sIp", getsIp())
|
||||
.append("sOneContent", getsOneContent())
|
||||
.append("sTwoContent", getsTwoContent())
|
||||
.append("sThreeContent", getsThreeContent())
|
||||
.append("sFourContent", getsFourContent())
|
||||
.append("goodsId", getGoodsId())
|
||||
.append("messageContent", getMessageContent())
|
||||
.append("quantity", getQuantity())
|
||||
.append("unit", getUnit())
|
||||
.append("productLine", getProductLine())
|
||||
.append("station", getStation())
|
||||
.append("inventoryPosition", getInventoryPosition())
|
||||
.append("updateTime", getUpdateTime())
|
||||
.append("goodsStatus", getGoodsStatus())
|
||||
.append("sStatus", getsStatus())
|
||||
.toString();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,62 +1,61 @@
|
|||
package com.ruoyi.app.mapper;
|
||||
|
||||
import java.util.List;
|
||||
import com.ruoyi.app.domain.AppLedConfig;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 【请填写功能名称】Mapper接口
|
||||
* led显示屏设置Mapper接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-01-14
|
||||
* @date 2025-03-07
|
||||
*/
|
||||
public interface AppLedConfigMapper
|
||||
{
|
||||
/**
|
||||
* 查询【请填写功能名称】
|
||||
* 查询led显示屏设置
|
||||
*
|
||||
* @param ledId 【请填写功能名称】主键
|
||||
* @return 【请填写功能名称】
|
||||
* @param id led显示屏设置主键
|
||||
* @return led显示屏设置
|
||||
*/
|
||||
public AppLedConfig selectAppLedConfigByLedId(String ledId);
|
||||
public AppLedConfig selectAppLedConfigById(String id);
|
||||
|
||||
/**
|
||||
* 查询【请填写功能名称】列表
|
||||
* 查询led显示屏设置列表
|
||||
*
|
||||
* @param appLedConfig 【请填写功能名称】
|
||||
* @return 【请填写功能名称】集合
|
||||
* @param appLedConfig led显示屏设置
|
||||
* @return led显示屏设置集合
|
||||
*/
|
||||
public List<AppLedConfig> selectAppLedConfigList(AppLedConfig appLedConfig);
|
||||
|
||||
/**
|
||||
* 新增【请填写功能名称】
|
||||
* 新增led显示屏设置
|
||||
*
|
||||
* @param appLedConfig 【请填写功能名称】
|
||||
* @param appLedConfig led显示屏设置
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertAppLedConfig(AppLedConfig appLedConfig);
|
||||
|
||||
/**
|
||||
* 修改【请填写功能名称】
|
||||
* 修改led显示屏设置
|
||||
*
|
||||
* @param appLedConfig 【请填写功能名称】
|
||||
* @param appLedConfig led显示屏设置
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateAppLedConfig(AppLedConfig appLedConfig);
|
||||
|
||||
/**
|
||||
* 删除【请填写功能名称】
|
||||
* 删除led显示屏设置
|
||||
*
|
||||
* @param ledId 【请填写功能名称】主键
|
||||
* @param id led显示屏设置主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteAppLedConfigByLedId(String ledId);
|
||||
public int deleteAppLedConfigById(String id);
|
||||
|
||||
/**
|
||||
* 批量删除【请填写功能名称】
|
||||
* 批量删除led显示屏设置
|
||||
*
|
||||
* @param ledIds 需要删除的数据主键集合
|
||||
* @param ids 需要删除的数据主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteAppLedConfigByLedIds(String[] ledIds);
|
||||
public int deleteAppLedConfigByIds(String[] ids);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,62 +1,61 @@
|
|||
package com.ruoyi.app.service;
|
||||
|
||||
import java.util.List;
|
||||
import com.ruoyi.app.domain.AppLedConfig;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 【请填写功能名称】Service接口
|
||||
* led显示屏设置Service接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-01-14
|
||||
* @date 2025-03-07
|
||||
*/
|
||||
public interface IAppLedConfigService
|
||||
{
|
||||
/**
|
||||
* 查询【请填写功能名称】
|
||||
* 查询led显示屏设置
|
||||
*
|
||||
* @param ledId 【请填写功能名称】主键
|
||||
* @return 【请填写功能名称】
|
||||
* @param id led显示屏设置主键
|
||||
* @return led显示屏设置
|
||||
*/
|
||||
public AppLedConfig selectAppLedConfigByLedId(String ledId);
|
||||
public AppLedConfig selectAppLedConfigById(String id);
|
||||
|
||||
/**
|
||||
* 查询【请填写功能名称】列表
|
||||
* 查询led显示屏设置列表
|
||||
*
|
||||
* @param appLedConfig 【请填写功能名称】
|
||||
* @return 【请填写功能名称】集合
|
||||
* @param appLedConfig led显示屏设置
|
||||
* @return led显示屏设置集合
|
||||
*/
|
||||
public List<AppLedConfig> selectAppLedConfigList(AppLedConfig appLedConfig);
|
||||
|
||||
/**
|
||||
* 新增【请填写功能名称】
|
||||
* 新增led显示屏设置
|
||||
*
|
||||
* @param appLedConfig 【请填写功能名称】
|
||||
* @param appLedConfig led显示屏设置
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertAppLedConfig(AppLedConfig appLedConfig);
|
||||
|
||||
/**
|
||||
* 修改【请填写功能名称】
|
||||
* 修改led显示屏设置
|
||||
*
|
||||
* @param appLedConfig 【请填写功能名称】
|
||||
* @param appLedConfig led显示屏设置
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateAppLedConfig(AppLedConfig appLedConfig);
|
||||
|
||||
/**
|
||||
* 批量删除【请填写功能名称】
|
||||
* 批量删除led显示屏设置
|
||||
*
|
||||
* @param ledIds 需要删除的【请填写功能名称】主键集合
|
||||
* @param ids 需要删除的led显示屏设置主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteAppLedConfigByLedIds(String[] ledIds);
|
||||
public int deleteAppLedConfigByIds(String[] ids);
|
||||
|
||||
/**
|
||||
* 删除【请填写功能名称】信息
|
||||
* 删除led显示屏设置信息
|
||||
*
|
||||
* @param ledId 【请填写功能名称】主键
|
||||
* @param id led显示屏设置主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteAppLedConfigByLedId(String ledId);
|
||||
public int deleteAppLedConfigById(String id);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
package com.ruoyi.app.service.impl;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.ruoyi.app.domain.AppLedConfig;
|
||||
import com.ruoyi.app.mapper.AppLedConfigMapper;
|
||||
import com.ruoyi.app.service.IAppLedConfigService;
|
||||
import com.ruoyi.common.utils.DateUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.ruoyi.app.mapper.AppLedConfigMapper;
|
||||
import com.ruoyi.app.domain.AppLedConfig;
|
||||
import com.ruoyi.app.service.IAppLedConfigService;
|
||||
|
||||
/**
|
||||
* 【请填写功能名称】Service业务层处理
|
||||
* led显示屏设置Service业务层处理
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-01-14
|
||||
* @date 2025-03-07
|
||||
*/
|
||||
@Service
|
||||
public class AppLedConfigServiceImpl implements IAppLedConfigService
|
||||
|
|
@ -21,22 +21,22 @@ public class AppLedConfigServiceImpl implements IAppLedConfigService
|
|||
private AppLedConfigMapper appLedConfigMapper;
|
||||
|
||||
/**
|
||||
* 查询【请填写功能名称】
|
||||
* 查询led显示屏设置
|
||||
*
|
||||
* @param ledId 【请填写功能名称】主键
|
||||
* @return 【请填写功能名称】
|
||||
* @param id led显示屏设置主键
|
||||
* @return led显示屏设置
|
||||
*/
|
||||
@Override
|
||||
public AppLedConfig selectAppLedConfigByLedId(String ledId)
|
||||
public AppLedConfig selectAppLedConfigById(String id)
|
||||
{
|
||||
return appLedConfigMapper.selectAppLedConfigByLedId(ledId);
|
||||
return appLedConfigMapper.selectAppLedConfigById(id);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询【请填写功能名称】列表
|
||||
* 查询led显示屏设置列表
|
||||
*
|
||||
* @param appLedConfig 【请填写功能名称】
|
||||
* @return 【请填写功能名称】
|
||||
* @param appLedConfig led显示屏设置
|
||||
* @return led显示屏设置
|
||||
*/
|
||||
@Override
|
||||
public List<AppLedConfig> selectAppLedConfigList(AppLedConfig appLedConfig)
|
||||
|
|
@ -45,9 +45,9 @@ public class AppLedConfigServiceImpl implements IAppLedConfigService
|
|||
}
|
||||
|
||||
/**
|
||||
* 新增【请填写功能名称】
|
||||
* 新增led显示屏设置
|
||||
*
|
||||
* @param appLedConfig 【请填写功能名称】
|
||||
* @param appLedConfig led显示屏设置
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
|
|
@ -57,38 +57,39 @@ public class AppLedConfigServiceImpl implements IAppLedConfigService
|
|||
}
|
||||
|
||||
/**
|
||||
* 修改【请填写功能名称】
|
||||
* 修改led显示屏设置
|
||||
*
|
||||
* @param appLedConfig 【请填写功能名称】
|
||||
* @param appLedConfig led显示屏设置
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int updateAppLedConfig(AppLedConfig appLedConfig)
|
||||
{
|
||||
appLedConfig.setUpdateTime(DateUtils.getNowDate());
|
||||
return appLedConfigMapper.updateAppLedConfig(appLedConfig);
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除【请填写功能名称】
|
||||
* 批量删除led显示屏设置
|
||||
*
|
||||
* @param ledIds 需要删除的【请填写功能名称】主键
|
||||
* @param ids 需要删除的led显示屏设置主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteAppLedConfigByLedIds(String[] ledIds)
|
||||
public int deleteAppLedConfigByIds(String[] ids)
|
||||
{
|
||||
return appLedConfigMapper.deleteAppLedConfigByLedIds(ledIds);
|
||||
return appLedConfigMapper.deleteAppLedConfigByIds(ids);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除【请填写功能名称】信息
|
||||
* 删除led显示屏设置信息
|
||||
*
|
||||
* @param ledId 【请填写功能名称】主键
|
||||
* @param id led显示屏设置主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteAppLedConfigByLedId(String ledId)
|
||||
public int deleteAppLedConfigById(String id)
|
||||
{
|
||||
return appLedConfigMapper.deleteAppLedConfigByLedId(ledId);
|
||||
return appLedConfigMapper.deleteAppLedConfigById(id);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,53 +1,137 @@
|
|||
<?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">
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.ruoyi.app.mapper.AppLedConfigMapper">
|
||||
|
||||
<resultMap type="AppLedConfig" id="AppLedConfigResult">
|
||||
<result property="ledId" column="led_id" />
|
||||
<result property="id" column="id" />
|
||||
<result property="sType" column="s_type" />
|
||||
<result property="sCode" column="s_code" />
|
||||
<result property="sIp" column="s_ip" />
|
||||
<result property="sOneContent" column="s_one_content" />
|
||||
<result property="sTwoContent" column="s_two_content" />
|
||||
<result property="sThreeContent" column="s_three_content" />
|
||||
<result property="sFourContent" column="s_four_content" />
|
||||
<result property="goodsId" column="goods_id" />
|
||||
<result property="messageContent" column="message_content" />
|
||||
<result property="quantity" column="quantity" />
|
||||
<result property="unit" column="unit" />
|
||||
<result property="productLine" column="product_line" />
|
||||
<result property="station" column="station" />
|
||||
<result property="inventoryPosition" column="inventory_position" />
|
||||
<result property="updateTime" column="update_time" />
|
||||
<result property="goodsStatus" column="goods_status" />
|
||||
<result property="sStatus" column="s_status" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectAppLedConfigVo">
|
||||
select led_id from app_led_config
|
||||
select id, s_type, s_code, s_ip, s_one_content, s_two_content, s_three_content, s_four_content, goods_id, message_content, quantity, unit, product_line, station, inventory_position, update_time, goods_status, s_status from app_led_config
|
||||
</sql>
|
||||
|
||||
<select id="selectAppLedConfigList" parameterType="AppLedConfig" resultMap="AppLedConfigResult">
|
||||
<include refid="selectAppLedConfigVo"/>
|
||||
<where>
|
||||
<if test="sType != null and sType != ''"> and s_type = #{sType}</if>
|
||||
<if test="sCode != null and sCode != ''"> and s_code = #{sCode}</if>
|
||||
<if test="sIp != null and sIp != ''"> and s_ip = #{sIp}</if>
|
||||
<if test="sOneContent != null and sOneContent != ''"> and s_one_content = #{sOneContent}</if>
|
||||
<if test="sTwoContent != null and sTwoContent != ''"> and s_two_content = #{sTwoContent}</if>
|
||||
<if test="sThreeContent != null and sThreeContent != ''"> and s_three_content = #{sThreeContent}</if>
|
||||
<if test="sFourContent != null and sFourContent != ''"> and s_four_content = #{sFourContent}</if>
|
||||
<if test="goodsId != null and goodsId != ''"> and goods_id = #{goodsId}</if>
|
||||
<if test="messageContent != null and messageContent != ''"> and message_content = #{messageContent}</if>
|
||||
<if test="quantity != null "> and quantity = #{quantity}</if>
|
||||
<if test="unit != null and unit != ''"> and unit = #{unit}</if>
|
||||
<if test="productLine != null and productLine != ''"> and product_line = #{productLine}</if>
|
||||
<if test="station != null and station != ''"> and station = #{station}</if>
|
||||
<if test="inventoryPosition != null and inventoryPosition != ''"> and inventory_position = #{inventoryPosition}</if>
|
||||
<if test="goodsStatus != null and goodsStatus != ''"> and goods_status = #{goodsStatus}</if>
|
||||
<if test="sStatus != null and sStatus != ''"> and s_status = #{sStatus}</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<select id="selectAppLedConfigByLedId" parameterType="String" resultMap="AppLedConfigResult">
|
||||
<select id="selectAppLedConfigById" parameterType="String" resultMap="AppLedConfigResult">
|
||||
<include refid="selectAppLedConfigVo"/>
|
||||
where led_id = #{ledId}
|
||||
where id = #{id}
|
||||
</select>
|
||||
|
||||
<insert id="insertAppLedConfig" parameterType="AppLedConfig">
|
||||
insert into app_led_config
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="ledId != null">led_id,</if>
|
||||
</trim>
|
||||
<if test="id != null">id,</if>
|
||||
<if test="sType != null">s_type,</if>
|
||||
<if test="sCode != null">s_code,</if>
|
||||
<if test="sIp != null">s_ip,</if>
|
||||
<if test="sOneContent != null">s_one_content,</if>
|
||||
<if test="sTwoContent != null">s_two_content,</if>
|
||||
<if test="sThreeContent != null">s_three_content,</if>
|
||||
<if test="sFourContent != null">s_four_content,</if>
|
||||
<if test="goodsId != null">goods_id,</if>
|
||||
<if test="messageContent != null">message_content,</if>
|
||||
<if test="quantity != null">quantity,</if>
|
||||
<if test="unit != null">unit,</if>
|
||||
<if test="productLine != null">product_line,</if>
|
||||
<if test="station != null">station,</if>
|
||||
<if test="inventoryPosition != null">inventory_position,</if>
|
||||
<if test="updateTime != null">update_time,</if>
|
||||
<if test="goodsStatus != null">goods_status,</if>
|
||||
<if test="sStatus != null">s_status,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="ledId != null">#{ledId},</if>
|
||||
</trim>
|
||||
<if test="id != null">#{id},</if>
|
||||
<if test="sType != null">#{sType},</if>
|
||||
<if test="sCode != null">#{sCode},</if>
|
||||
<if test="sIp != null">#{sIp},</if>
|
||||
<if test="sOneContent != null">#{sOneContent},</if>
|
||||
<if test="sTwoContent != null">#{sTwoContent},</if>
|
||||
<if test="sThreeContent != null">#{sThreeContent},</if>
|
||||
<if test="sFourContent != null">#{sFourContent},</if>
|
||||
<if test="goodsId != null">#{goodsId},</if>
|
||||
<if test="messageContent != null">#{messageContent},</if>
|
||||
<if test="quantity != null">#{quantity},</if>
|
||||
<if test="unit != null">#{unit},</if>
|
||||
<if test="productLine != null">#{productLine},</if>
|
||||
<if test="station != null">#{station},</if>
|
||||
<if test="inventoryPosition != null">#{inventoryPosition},</if>
|
||||
<if test="updateTime != null">#{updateTime},</if>
|
||||
<if test="goodsStatus != null">#{goodsStatus},</if>
|
||||
<if test="sStatus != null">#{sStatus},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateAppLedConfig" parameterType="AppLedConfig">
|
||||
update app_led_config
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="sType != null">s_type = #{sType},</if>
|
||||
<if test="sCode != null">s_code = #{sCode},</if>
|
||||
<if test="sIp != null">s_ip = #{sIp},</if>
|
||||
<if test="sOneContent != null">s_one_content = #{sOneContent},</if>
|
||||
<if test="sTwoContent != null">s_two_content = #{sTwoContent},</if>
|
||||
<if test="sThreeContent != null">s_three_content = #{sThreeContent},</if>
|
||||
<if test="sFourContent != null">s_four_content = #{sFourContent},</if>
|
||||
<if test="goodsId != null">goods_id = #{goodsId},</if>
|
||||
<if test="messageContent != null">message_content = #{messageContent},</if>
|
||||
<if test="quantity != null">quantity = #{quantity},</if>
|
||||
<if test="unit != null">unit = #{unit},</if>
|
||||
<if test="productLine != null">product_line = #{productLine},</if>
|
||||
<if test="station != null">station = #{station},</if>
|
||||
<if test="inventoryPosition != null">inventory_position = #{inventoryPosition},</if>
|
||||
<if test="updateTime != null">update_time = #{updateTime},</if>
|
||||
<if test="goodsStatus != null">goods_status = #{goodsStatus},</if>
|
||||
<if test="sStatus != null">s_status = #{sStatus},</if>
|
||||
</trim>
|
||||
where led_id = #{ledId}
|
||||
where id = #{id}
|
||||
</update>
|
||||
|
||||
<delete id="deleteAppLedConfigByLedId" parameterType="String">
|
||||
delete from app_led_config where led_id = #{ledId}
|
||||
<delete id="deleteAppLedConfigById" parameterType="String">
|
||||
delete from app_led_config where id = #{id}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteAppLedConfigByLedIds" parameterType="String">
|
||||
delete from app_led_config where led_id in
|
||||
<foreach item="ledId" collection="array" open="(" separator="," close=")">
|
||||
#{ledId}
|
||||
<delete id="deleteAppLedConfigByIds" parameterType="String">
|
||||
delete from app_led_config where id in
|
||||
<foreach item="id" collection="array" open="(" separator="," close=")">
|
||||
#{id}
|
||||
</foreach>
|
||||
</delete>
|
||||
</mapper>
|
||||
Loading…
Reference in New Issue
Block a user