diff --git a/lzbi-generator/src/main/java/com/lzbi/generator/util/GenUtils.java b/lzbi-generator/src/main/java/com/lzbi/generator/util/GenUtils.java index 19ee20a..3da405e 100644 --- a/lzbi-generator/src/main/java/com/lzbi/generator/util/GenUtils.java +++ b/lzbi-generator/src/main/java/com/lzbi/generator/util/GenUtils.java @@ -217,7 +217,7 @@ public class GenUtils */ public static String replaceText(String text) { - return RegExUtils.replaceAll(text, "(?:表|若依)", ""); + return RegExUtils.replaceAll(text, "(?:表|联美)", ""); } /** diff --git a/lzbi-generator/src/main/java/com/lzbi/generator/util/VelocityUtils.java b/lzbi-generator/src/main/java/com/lzbi/generator/util/VelocityUtils.java index 6979658..c8adae5 100644 --- a/lzbi-generator/src/main/java/com/lzbi/generator/util/VelocityUtils.java +++ b/lzbi-generator/src/main/java/com/lzbi/generator/util/VelocityUtils.java @@ -175,11 +175,11 @@ public class VelocityUtils if (template.contains("domain.java.vm")) { - fileName = StringUtils.format("{}/domain/{}Dao.java", javaPath, className); + fileName = StringUtils.format("{}/domain/{}.java", javaPath, className); } if (template.contains("sub-domain.java.vm") && StringUtils.equals(GenConstants.TPL_SUB, genTable.getTplCategory())) { - fileName = StringUtils.format("{}/domain/{}Dao.java", javaPath, genTable.getSubTable().getClassName()); + fileName = StringUtils.format("{}/domain/{}.java", javaPath, genTable.getSubTable().getClassName()); } else if (template.contains("mapper.java.vm")) { diff --git a/lzbi-generator/src/main/resources/vm/java/controller.java.vm b/lzbi-generator/src/main/resources/vm/java/controller.java.vm index 471fd90..0c3a8ff 100644 --- a/lzbi-generator/src/main/resources/vm/java/controller.java.vm +++ b/lzbi-generator/src/main/resources/vm/java/controller.java.vm @@ -1,5 +1,7 @@ package ${packageName}.controller; - +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; import java.util.List; import javax.servlet.http.HttpServletResponse; import org.springframework.security.access.prepost.PreAuthorize; @@ -50,13 +52,13 @@ public class ${ClassName}Controller extends BaseController public TableDataInfo list(${ClassName} ${ClassName}) { startPage(); - List< ${ClassName}> list = ${className}Service.select ${ClassName}List(${ClassName}); + List< ${ClassName}> list = ${className}Service.select${ClassName}List(${ClassName}); return getDataTable(list); } #elseif($table.tree) public AjaxResult list(${ClassName} ${ClassName}) { - List< ${ClassName}> list = ${className}Service.select ${ClassName}List(${ClassName}); + List< ${ClassName}> list = ${className}Service.select${ClassName}List(${ClassName}); return success(list); } #end @@ -71,10 +73,10 @@ public class ${ClassName}Controller extends BaseController @PreAuthorize("@ss.hasPermi('${permissionPrefix}:export')") @Log(title = "${functionName}", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, ${ClassName} ${ClassName}) + public void export(HttpServletResponse response,${ClassName} ${ClassName}) { - List< ${ClassName}> list = ${className}Service.select ${ClassName}List(${ClassName}); - ExcelUtil< ${ClassName}> util = new ExcelUtil<(${ClassName}>(${ClassName}.class); + List<${ClassName}> list = ${className}Service.select${ClassName}List(${ClassName}); + ExcelUtil<${ClassName}> util = new ExcelUtil<${ClassName}>(${ClassName}.class); util.exportExcel(response, list, "${functionName}数据"); } diff --git a/lzbi-module/src/main/java/com/lzbi/code/controller/DcBusiCoderuleConfigController.java b/lzbi-module/src/main/java/com/lzbi/code/controller/DcBusiCoderuleConfigController.java new file mode 100644 index 0000000..6513d30 --- /dev/null +++ b/lzbi-module/src/main/java/com/lzbi/code/controller/DcBusiCoderuleConfigController.java @@ -0,0 +1,131 @@ +package com.lzbi.code.controller; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +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.lzbi.common.annotation.Log; +import com.lzbi.common.core.controller.BaseController; +import com.lzbi.common.core.domain.AjaxResult; +import com.lzbi.common.enums.BusinessType; +import com.lzbi.code.domain. DcBusiCoderuleConfig; +import com.lzbi.code.service.DcBusiCoderuleConfigService; +import com.lzbi.common.utils.poi.ExcelUtil; +import com.lzbi.common.core.page.TableDataInfo; + +/** + * 业务编码配置Controller + * + * @author zhousq + * @date 2023-12-06 + */ +@RestController +@RequestMapping("/asset/busiCodeConfig") +public class DcBusiCoderuleConfigController extends BaseController +{ + @Autowired + private DcBusiCoderuleConfigService dcBusiCoderuleConfigService; + + /** + * 查询业务编码配置列表 + */ + @ApiOperation("查询业务编码配置列表") + @ApiImplicitParams({ + @ApiImplicitParam(name = "DcBusiCoderuleConfig", value = "", dataType = "DcBusiCoderuleConfig", dataTypeClass = DcBusiCoderuleConfig.class), + }) + @PreAuthorize("@ss.hasPermi('asset:busiCodeConfig:list')") + @GetMapping("/list") + public TableDataInfo list(DcBusiCoderuleConfig DcBusiCoderuleConfig) + { + startPage(); + List< DcBusiCoderuleConfig> list = dcBusiCoderuleConfigService.selectDcBusiCoderuleConfigList(DcBusiCoderuleConfig); + return getDataTable(list); + } + + /** + * 导出业务编码配置列表 + */ + @ApiOperation("导出业务编码配置列表") + @ApiImplicitParams({ + @ApiImplicitParam(name = "DcBusiCoderuleConfig", value = "", dataType = "DcBusiCoderuleConfig", dataTypeClass = DcBusiCoderuleConfig.class), + }) + @PreAuthorize("@ss.hasPermi('asset:busiCodeConfig:export')") + @Log(title = "业务编码配置", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response,DcBusiCoderuleConfig DcBusiCoderuleConfig) + { + List list = dcBusiCoderuleConfigService.selectDcBusiCoderuleConfigList(DcBusiCoderuleConfig); + ExcelUtil util = new ExcelUtil(DcBusiCoderuleConfig.class); + util.exportExcel(response, list, "业务编码配置数据"); + } + + /** + * 获取业务编码配置详细信息 + */ + @ApiOperation("获取业务编码配置详细信息") + @ApiImplicitParams({ + @ApiImplicitParam(name = "id", value = "", dataType = "Long", dataTypeClass = Long.class), + }) + @PreAuthorize("@ss.hasPermi('asset:busiCodeConfig:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(dcBusiCoderuleConfigService.selectDcBusiCoderuleConfigById(id)); + } + + /** + * 新增业务编码配置 + */ + @ApiOperation("新增业务编码配置") + @ApiImplicitParams({ + @ApiImplicitParam(name = "DcBusiCoderuleConfig", value = "", dataType = "DcBusiCoderuleConfig", dataTypeClass = DcBusiCoderuleConfig.class), + }) + @PreAuthorize("@ss.hasPermi('asset:busiCodeConfig:add')") + @Log(title = "业务编码配置", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody DcBusiCoderuleConfig DcBusiCoderuleConfig) + { + return toAjax(dcBusiCoderuleConfigService.insertDcBusiCoderuleConfig(DcBusiCoderuleConfig)); + } + + /** + * 修改业务编码配置 + */ + + @ApiOperation("修改业务编码配置") + @ApiImplicitParams({ + @ApiImplicitParam(name = "DcBusiCoderuleConfig", value = "", dataType = "DcBusiCoderuleConfig", dataTypeClass = DcBusiCoderuleConfig.class), + }) + @PreAuthorize("@ss.hasPermi('asset:busiCodeConfig:edit')") + @Log(title = "业务编码配置", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody DcBusiCoderuleConfig DcBusiCoderuleConfig) + { + return toAjax(dcBusiCoderuleConfigService.updateDcBusiCoderuleConfig(DcBusiCoderuleConfig)); + } + + /** + * 删除业务编码配置 + */ + @ApiOperation("删除业务编码配置") + @ApiImplicitParams({ + @ApiImplicitParam(name = "ids", value = "", dataType = "Long", dataTypeClass =Long.class), + }) + @PreAuthorize("@ss.hasPermi('asset:busiCodeConfig:remove')") + @Log(title = "业务编码配置", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(dcBusiCoderuleConfigService.deleteDcBusiCoderuleConfigByIds(ids)); + } +} diff --git a/lzbi-module/src/main/java/com/lzbi/code/domain/DcBaseCoderuleDefine.java b/lzbi-module/src/main/java/com/lzbi/code/domain/DcBaseCoderuleDefine.java new file mode 100644 index 0000000..aa03417 --- /dev/null +++ b/lzbi-module/src/main/java/com/lzbi/code/domain/DcBaseCoderuleDefine.java @@ -0,0 +1,62 @@ +package com.lzbi.code.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import lombok.Data; +import com.lzbi.common.annotation.Excel; +import com.lzbi.module.base.BaseModuleEntity; + +/** + * 编码规则定义对象 dc_base_coderule_define + * + * @author zhousq + * @date 2023-12-06 + */ +@Data +public class DcBaseCoderuleDefine extends BaseModuleEntity +{ + private static final long serialVersionUID = 1L; + + /** 创建人 */ + private String createdBy; + + /** 创建时间 */ + private Date createdTime; + + /** 更新人 */ + private String updatedBy; + + /** 更新时间 */ + private Date updatedTime; + + /** 配置ID */ + @Excel(name = "配置ID") + private Long id; + + /** 配置名称 */ + @Excel(name = "配置名称") + private String codeConfigName; + + /** 编码头 */ + @Excel(name = "编码头") + private String codeHeader; + + /** 编码体 */ + @Excel(name = "编码体") + private String codeBody; + + /** 编码体类型 */ + @Excel(name = "编码体类型") + private String codeBodyType; + + /** 流水号长度 */ + @Excel(name = "流水号长度") + private Long codeSerialLength; + + /** 分割符 */ + @Excel(name = "分割符") + private String codeSplitFlag; + +} diff --git a/lzbi-module/src/main/java/com/lzbi/code/domain/DcBusiCoderuleConfig.java b/lzbi-module/src/main/java/com/lzbi/code/domain/DcBusiCoderuleConfig.java new file mode 100644 index 0000000..95b770d --- /dev/null +++ b/lzbi-module/src/main/java/com/lzbi/code/domain/DcBusiCoderuleConfig.java @@ -0,0 +1,53 @@ +package com.lzbi.code.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import lombok.Data; +import com.lzbi.common.annotation.Excel; +import com.lzbi.module.base.BaseModuleEntity; + +/** + * 业务编码配置对象 dc_busi_coderule_config + * + * @author zhousq + * @date 2023-12-06 + */ +@Data +public class DcBusiCoderuleConfig extends BaseModuleEntity +{ + private static final long serialVersionUID = 1L; + + /** 创建人 */ + private String createdBy; + + /** 创建时间 */ + private Date createdTime; + + /** 更新人 */ + private String updatedBy; + + /** 更新时间 */ + private Date updatedTime; + + /** 主键 */ + private Long id; + + /** 配置名称 */ + @Excel(name = "配置名称") + private String configName; + + /** 业务代码 */ + @Excel(name = "业务代码") + private String nodeCode; + + /** 字段名称 */ + @Excel(name = "字段名称") + private String columnName; + + /** 规则ID */ + @Excel(name = "规则ID") + private Long ruleId; + +} diff --git a/lzbi-module/src/main/java/com/lzbi/code/mapper/DcBusiCoderuleConfigMapper.java b/lzbi-module/src/main/java/com/lzbi/code/mapper/DcBusiCoderuleConfigMapper.java new file mode 100644 index 0000000..4252c9d --- /dev/null +++ b/lzbi-module/src/main/java/com/lzbi/code/mapper/DcBusiCoderuleConfigMapper.java @@ -0,0 +1,63 @@ +package com.lzbi.code.mapper; + +import java.util.List; +import com.lzbi.code.domain.DcBusiCoderuleConfig; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * 业务编码配置Mapper接口 + * + * @author zhousq + * @date 2023-12-06 + */ + +public interface DcBusiCoderuleConfigMapper extends BaseMapper +{ + /** + * 查询业务编码配置 + * + * @param id 业务编码配置主键 + * @return 业务编码配置 + */ + public DcBusiCoderuleConfig selectDcBusiCoderuleConfigById(Long id); + + /** + * 查询业务编码配置列表 + * + * @param dcBusiCoderuleConfig 业务编码配置 + * @return 业务编码配置集合 + */ + public List selectDcBusiCoderuleConfigList(DcBusiCoderuleConfig dcBusiCoderuleConfig); + + /** + * 新增业务编码配置 + * + * @param dcBusiCoderuleConfig 业务编码配置 + * @return 结果 + */ + public int insertDcBusiCoderuleConfig(DcBusiCoderuleConfig dcBusiCoderuleConfig); + + /** + * 修改业务编码配置 + * + * @param dcBusiCoderuleConfig 业务编码配置 + * @return 结果 + */ + public int updateDcBusiCoderuleConfig(DcBusiCoderuleConfig dcBusiCoderuleConfig); + + /** + * 删除业务编码配置 + * + * @param id 业务编码配置主键 + * @return 结果 + */ + public int deleteDcBusiCoderuleConfigById(Long id); + + /** + * 批量删除业务编码配置 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteDcBusiCoderuleConfigByIds(Long[] ids); +} diff --git a/lzbi-module/src/main/java/com/lzbi/code/service/CodeNoGenerater.java b/lzbi-module/src/main/java/com/lzbi/code/service/CodeNoGenerater.java index d939aac..68822d5 100644 --- a/lzbi-module/src/main/java/com/lzbi/code/service/CodeNoGenerater.java +++ b/lzbi-module/src/main/java/com/lzbi/code/service/CodeNoGenerater.java @@ -35,6 +35,7 @@ public class CodeNoGenerater { StringBuilder codeBuffer=new StringBuilder(); // String spitChar= Optional.ofNullable(ruleDao.getCodeSplitFlag()).orElse(""); + spitChar=spitChar.equals("*")?"":spitChar; codeBuffer.append(ruleDao.getCodeHeader()).append(spitChar).append(getBody(ruleDao)).append(spitChar).append(StringUtils.leftPad(serial,serialLen,'0')); return codeBuffer.toString(); } diff --git a/lzbi-module/src/main/java/com/lzbi/code/service/DcBusiCoderuleConfigService.java b/lzbi-module/src/main/java/com/lzbi/code/service/DcBusiCoderuleConfigService.java new file mode 100644 index 0000000..bc61f41 --- /dev/null +++ b/lzbi-module/src/main/java/com/lzbi/code/service/DcBusiCoderuleConfigService.java @@ -0,0 +1,91 @@ +package com.lzbi.code.service; + +import java.util.List; +import com.lzbi.common.utils.DateUtils; +import org.springframework.stereotype.Service; +import com.lzbi.code.domain.DcBusiCoderuleConfig; +import com.lzbi.code.mapper.DcBusiCoderuleConfigMapper; +import com.baomidou.mybatisplus.extension.service.IService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +/** + * 业务编码配置Service业务层处理 + * + * @author zhousq + * @date 2023-12-06 + */ +@Service +public class DcBusiCoderuleConfigService extends ServiceImpl implements IService +{ + + /** + * 查询业务编码配置 + * + * @param id 业务编码配置主键 + * @return 业务编码配置 + */ + public DcBusiCoderuleConfig selectDcBusiCoderuleConfigById(Long id) + { + return baseMapper.selectDcBusiCoderuleConfigById(id); + } + + /** + * 查询业务编码配置列表 + * + * @param dcBusiCoderuleConfig 业务编码配置 + * @return 业务编码配置 + */ + public List selectDcBusiCoderuleConfigList(DcBusiCoderuleConfig dcBusiCoderuleConfig) + { + return baseMapper.selectDcBusiCoderuleConfigList(dcBusiCoderuleConfig); + } + + /** + * 新增业务编码配置 + * + * @param dcBusiCoderuleConfig 业务编码配置 + * @return 结果 + */ + + public int insertDcBusiCoderuleConfig(DcBusiCoderuleConfig dcBusiCoderuleConfig) + { + dcBusiCoderuleConfig.setCreatedTime(DateUtils.getNowDate()); + return baseMapper.insertDcBusiCoderuleConfig(dcBusiCoderuleConfig); + } + + /** + * 修改业务编码配置 + * + * @param dcBusiCoderuleConfig 业务编码配置 + * @return 结果 + */ + + public int updateDcBusiCoderuleConfig(DcBusiCoderuleConfig dcBusiCoderuleConfig) + { + dcBusiCoderuleConfig.setUpdatedTime(DateUtils.getNowDate()); + return baseMapper.updateDcBusiCoderuleConfig(dcBusiCoderuleConfig); + } + + /** + * 批量删除业务编码配置 + * + * @param ids 需要删除的业务编码配置主键 + * @return 结果 + */ + + public int deleteDcBusiCoderuleConfigByIds(Long[] ids) + { + return baseMapper.deleteDcBusiCoderuleConfigByIds(ids); + } + + /** + * 删除业务编码配置信息 + * + * @param id 业务编码配置主键 + * @return 结果 + */ + + public int deleteDcBusiCoderuleConfigById(Long id) + { + return baseMapper.deleteDcBusiCoderuleConfigById(id); + } +} diff --git a/lzbi-module/src/main/java/com/lzbi/draft/controller/DcBusiParamDraftDayController.java b/lzbi-module/src/main/java/com/lzbi/draft/controller/DcBusiParamDraftDayController.java new file mode 100644 index 0000000..f9b70c2 --- /dev/null +++ b/lzbi-module/src/main/java/com/lzbi/draft/controller/DcBusiParamDraftDayController.java @@ -0,0 +1,131 @@ +package com.lzbi.draft.controller; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +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.lzbi.common.annotation.Log; +import com.lzbi.common.core.controller.BaseController; +import com.lzbi.common.core.domain.AjaxResult; +import com.lzbi.common.enums.BusinessType; +import com.lzbi.draft.domain. DcBusiParamDraftDay; +import com.lzbi.draft.service.DcBusiParamDraftDayService; +import com.lzbi.common.utils.poi.ExcelUtil; +import com.lzbi.common.core.page.TableDataInfo; + +/** + * 参数数据底稿（日）Controller + * + * @author zhousq + * @date 2023-12-06 + */ +@RestController +@RequestMapping("/asset/paramDayDraft") +public class DcBusiParamDraftDayController extends BaseController +{ + @Autowired + private DcBusiParamDraftDayService dcBusiParamDraftDayService; + + /** + * 查询参数数据底稿（日）列表 + */ + @ApiOperation("查询参数数据底稿（日）列表") + @ApiImplicitParams({ + @ApiImplicitParam(name = "DcBusiParamDraftDay", value = "", dataType = "DcBusiParamDraftDay", dataTypeClass = DcBusiParamDraftDay.class), + }) + @PreAuthorize("@ss.hasPermi('asset:paramDayDraft:list')") + @GetMapping("/list") + public TableDataInfo list(DcBusiParamDraftDay DcBusiParamDraftDay) + { + startPage(); + List< DcBusiParamDraftDay> list = dcBusiParamDraftDayService.selectDcBusiParamDraftDayList(DcBusiParamDraftDay); + return getDataTable(list); + } + + /** + * 导出参数数据底稿（日）列表 + */ + @ApiOperation("导出参数数据底稿（日）列表") + @ApiImplicitParams({ + @ApiImplicitParam(name = "DcBusiParamDraftDay", value = "", dataType = "DcBusiParamDraftDay", dataTypeClass = DcBusiParamDraftDay.class), + }) + @PreAuthorize("@ss.hasPermi('asset:paramDayDraft:export')") + @Log(title = "参数数据底稿（日）", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response,DcBusiParamDraftDay DcBusiParamDraftDay) + { + List list = dcBusiParamDraftDayService.selectDcBusiParamDraftDayList(DcBusiParamDraftDay); + ExcelUtil util = new ExcelUtil(DcBusiParamDraftDay.class); + util.exportExcel(response, list, "参数数据底稿（日）数据"); + } + + /** + * 获取参数数据底稿（日）详细信息 + */ + @ApiOperation("获取参数数据底稿（日）详细信息") + @ApiImplicitParams({ + @ApiImplicitParam(name = "id", value = "", dataType = "String", dataTypeClass = String.class), + }) + @PreAuthorize("@ss.hasPermi('asset:paramDayDraft:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") String id) + { + return success(dcBusiParamDraftDayService.selectDcBusiParamDraftDayById(id)); + } + + /** + * 新增参数数据底稿（日） + */ + @ApiOperation("新增参数数据底稿（日）") + @ApiImplicitParams({ + @ApiImplicitParam(name = "DcBusiParamDraftDay", value = "", dataType = "DcBusiParamDraftDay", dataTypeClass = DcBusiParamDraftDay.class), + }) + @PreAuthorize("@ss.hasPermi('asset:paramDayDraft:add')") + @Log(title = "参数数据底稿（日）", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody DcBusiParamDraftDay DcBusiParamDraftDay) + { + return toAjax(dcBusiParamDraftDayService.insertDcBusiParamDraftDay(DcBusiParamDraftDay)); + } + + /** + * 修改参数数据底稿（日） + */ + + @ApiOperation("修改参数数据底稿（日）") + @ApiImplicitParams({ + @ApiImplicitParam(name = "DcBusiParamDraftDay", value = "", dataType = "DcBusiParamDraftDay", dataTypeClass = DcBusiParamDraftDay.class), + }) + @PreAuthorize("@ss.hasPermi('asset:paramDayDraft:edit')") + @Log(title = "参数数据底稿（日）", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody DcBusiParamDraftDay DcBusiParamDraftDay) + { + return toAjax(dcBusiParamDraftDayService.updateDcBusiParamDraftDay(DcBusiParamDraftDay)); + } + + /** + * 删除参数数据底稿（日） + */ + @ApiOperation("删除参数数据底稿（日）") + @ApiImplicitParams({ + @ApiImplicitParam(name = "ids", value = "", dataType = "String", dataTypeClass =String.class), + }) + @PreAuthorize("@ss.hasPermi('asset:paramDayDraft:remove')") + @Log(title = "参数数据底稿（日）", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable String[] ids) + { + return toAjax(dcBusiParamDraftDayService.deleteDcBusiParamDraftDayByIds(ids)); + } +} diff --git a/lzbi-module/src/main/java/com/lzbi/draft/controller/DcBusiTargetDraftMonthController.java b/lzbi-module/src/main/java/com/lzbi/draft/controller/DcBusiTargetDraftMonthController.java new file mode 100644 index 0000000..6f39409 --- /dev/null +++ b/lzbi-module/src/main/java/com/lzbi/draft/controller/DcBusiTargetDraftMonthController.java @@ -0,0 +1,133 @@ +package com.lzbi.draft.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +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.lzbi.common.annotation.Log; +import com.lzbi.common.core.controller.BaseController; +import com.lzbi.common.core.domain.AjaxResult; +import com.lzbi.common.enums.BusinessType; +import com.lzbi.draft.domain. DcBusiTargetDraftMonth; +import com.lzbi.draft.service.DcBusiTargetDraftMonthService; +import com.lzbi.common.utils.poi.ExcelUtil; +import com.lzbi.common.core.page.TableDataInfo; + +/** + * 指标数据底稿(月)Controller + * + * @author zhousq + * @date 2023-12-06 + */ +@RestController +@RequestMapping("/draft/targetMonthDraft") +public class DcBusiTargetDraftMonthController extends BaseController +{ + @Autowired + private DcBusiTargetDraftMonthService dcBusiTargetDraftMonthService; + + /** + * 查询指标数据底稿(月)列表 + */ + @ApiOperation("查询指标数据底稿(月)列表") + @ApiImplicitParams({ + @ApiImplicitParam(name = "DcBusiTargetDraftMonth", value = "", dataType = "DcBusiTargetDraftMonth", dataTypeClass = DcBusiTargetDraftMonth.class), + }) + @PreAuthorize("@ss.hasPermi('draft:targetMonthDraft:list')") + @GetMapping("/list") + public TableDataInfo list(DcBusiTargetDraftMonth DcBusiTargetDraftMonth) + { + startPage(); + List< DcBusiTargetDraftMonth> list = dcBusiTargetDraftMonthService.selectDcBusiTargetDraftMonthList(DcBusiTargetDraftMonth); + return getDataTable(list); + } + + /** + * 导出指标数据底稿(月)列表 + */ + @ApiOperation("导出指标数据底稿(月)列表") + @ApiImplicitParams({ + @ApiImplicitParam(name = "DcBusiTargetDraftMonth", value = "", dataType = "DcBusiTargetDraftMonth", dataTypeClass = DcBusiTargetDraftMonth.class), + }) + @PreAuthorize("@ss.hasPermi('draft:targetMonthDraft:export')") + @Log(title = "指标数据底稿(月)", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, DcBusiTargetDraftMonth DcBusiTargetDraftMonth) + { + List< DcBusiTargetDraftMonth> list = dcBusiTargetDraftMonthService.selectDcBusiTargetDraftMonthList(DcBusiTargetDraftMonth); + ExcelUtil< DcBusiTargetDraftMonth> util = new ExcelUtil(DcBusiTargetDraftMonth.class); + util.exportExcel(response, list, "指标数据底稿(月)数据"); + } + + /** + * 获取指标数据底稿(月)详细信息 + */ + @ApiOperation("获取指标数据底稿(月)详细信息") + @ApiImplicitParams({ + @ApiImplicitParam(name = "id", value = "", dataType = "Long", dataTypeClass = Long.class), + }) + @PreAuthorize("@ss.hasPermi('draft:targetMonthDraft:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(dcBusiTargetDraftMonthService.selectDcBusiTargetDraftMonthById(id)); + } + + /** + * 新增指标数据底稿(月) + */ + @ApiOperation("新增指标数据底稿(月)") + @ApiImplicitParams({ + @ApiImplicitParam(name = "DcBusiTargetDraftMonth", value = "", dataType = "DcBusiTargetDraftMonth", dataTypeClass = DcBusiTargetDraftMonth.class), + }) + @PreAuthorize("@ss.hasPermi('draft:targetMonthDraft:add')") + @Log(title = "指标数据底稿(月)", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody DcBusiTargetDraftMonth DcBusiTargetDraftMonth) + { + return toAjax(dcBusiTargetDraftMonthService.insertDcBusiTargetDraftMonth(DcBusiTargetDraftMonth)); + } + + /** + * 修改指标数据底稿(月) + */ + + @ApiOperation("修改指标数据底稿(月)") + @ApiImplicitParams({ + @ApiImplicitParam(name = "DcBusiTargetDraftMonth", value = "", dataType = "DcBusiTargetDraftMonth", dataTypeClass = DcBusiTargetDraftMonth.class), + }) + @PreAuthorize("@ss.hasPermi('draft:targetMonthDraft:edit')") + @Log(title = "指标数据底稿(月)", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody DcBusiTargetDraftMonth DcBusiTargetDraftMonth) + { + return toAjax(dcBusiTargetDraftMonthService.updateDcBusiTargetDraftMonth(DcBusiTargetDraftMonth)); + } + + /** + * 删除指标数据底稿(月) + */ + @ApiOperation("删除指标数据底稿(月)") + @ApiImplicitParams({ + @ApiImplicitParam(name = "ids", value = "", dataType = "Long", dataTypeClass =Long.class), + }) + @PreAuthorize("@ss.hasPermi('draft:targetMonthDraft:remove')") + @Log(title = "指标数据底稿(月)", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(dcBusiTargetDraftMonthService.deleteDcBusiTargetDraftMonthByIds(ids)); + } +} diff --git a/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiParamDraftDay.java b/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiParamDraftDay.java index 4e0757e..4825b10 100644 --- a/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiParamDraftDay.java +++ b/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiParamDraftDay.java @@ -1,157 +1,203 @@ package com.lzbi.draft.domain; -import com.baomidou.mybatisplus.annotation.IdType; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableId; -import lombok.AllArgsConstructor; + +import java.util.Date; import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.Accessors; +import com.lzbi.common.annotation.Excel; import com.lzbi.module.base.BaseModuleEntity; /** - * 参数数据底稿表（日）; - * @author : zhousq - * @date : 2023-12-1 + * 参数数据底稿（日）对象 dc_busi_param_draft_day + * + * @author zhousq + * @date 2023-12-06 */ @Data -@NoArgsConstructor -@AllArgsConstructor -@Accessors(chain = true) -@ApiModel(value = "参数数据底稿表（日）",description = "") -@TableName("dc_busi_param_draft_day") -public class DcBusiParamDraftDay extends BaseModuleEntity{ +public class DcBusiParamDraftDay extends BaseModuleEntity +{ + private static final long serialVersionUID = 1L; + + /** 创建人 */ + private String createdBy; + + /** 创建时间 */ + private Date createdTime; + + /** 更新人 */ + private String updatedBy; + + /** 更新时间 */ + private Date updatedTime; + /** 主键 */ - @ApiModelProperty(name = "主键",notes = "") - @TableId(type = IdType.AUTO) - private Integer id ; + @Excel(name = "主键") + private String id; + /** 公司编码 */ - @ApiModelProperty(name = "公司编码",notes = "") - private String companyCode ; + private Integer companyId; + /** 生产组织机构名称 */ - @ApiModelProperty(name = "生产组织机构名称",notes = "") - private String organizeName ; + @Excel(name = "生产组织机构名称") + private String organizeName; + /** 生产组织机构编号 */ - @ApiModelProperty(name = "生产组织机构编号",notes = "") - private String organizeCode ; + private Integer organizeId; + /** 公司名称 */ - @ApiModelProperty(name = "公司名称",notes = "") - private String companyName ; - /** 统计单元 */ - @ApiModelProperty(name = "统计单元",notes = "") - private String assetCode ; - @ApiModelProperty(name = "统计单元",notes = "") - private String assetName ; + @Excel(name = "公司名称") + private String companyName; + + /** 统计单元编码 */ + @Excel(name = "统计单元编码") + private String assetCode; /** 参数编码 */ - @ApiModelProperty(name = "参数编码",notes = "") - private String paramCode ; + @Excel(name = "参数编码") + private String paramCode; + /** 参数名称 */ - @ApiModelProperty(name = "参数名称",notes = "") - private String paramName ; - /** 生产专业 */ - @ApiModelProperty(name = "生产专业",notes = "") - private String paramField ; + @Excel(name = "参数名称") + private String paramName; + + /** 生产专业编码 */ + @Excel(name = "生产专业编码") + private String paramFieldCode; + @Excel(name = "生产专业名称") + private String paramFieldName; /** 指标单位 */ - @ApiModelProperty(name = "指标单位",notes = "") - private String targetUint ; - /** 统计日期[yyyy-mm-dd] */ - @ApiModelProperty(name = "统计日期[yyyy-mm-dd]",notes = "") - private String countDate ; + @Excel(name = "指标单位") + private String targetUint; + + /** 统计日期[ */ + @Excel(name = "统计日期[") + private String countDate; + /** 均值 */ - @ApiModelProperty(name = "均值",notes = "") - private Double valAvg ; + @Excel(name = "均值") + private double valAvg; + /** 当日最大值 */ - @ApiModelProperty(name = "当日最大值",notes = "") - private Double valMax ; + @Excel(name = "当日最大值") + private double valMax; + /** 和值 */ - @ApiModelProperty(name = "和值",notes = "") - private String valSum ; + @Excel(name = "和值") + private String valSum; + /** 当日最小值 */ - @ApiModelProperty(name = "当日最小值",notes = "") - private Double valMin ; + @Excel(name = "当日最小值") + private double valMin; + /** 积算值 */ - @ApiModelProperty(name = "积算值",notes = "") - private Double valIntegrating ; + @Excel(name = "积算值") + private double valIntegrating; + /** 上限 */ - @ApiModelProperty(name = "上限",notes = "") - private Double valLimitUp ; + @Excel(name = "上限") + private double valLimitUp; + /** 下限 */ - @ApiModelProperty(name = "下限",notes = "") - private Double valLimitDown ; - /** 1时;[00:00:00，00：59:59] */ - @ApiModelProperty(name = "1时",notes = "[00:00:00，00：59:59]") - private Double val01 ; + @Excel(name = "下限") + private double valLimitDown; + + /** 1时 */ + @Excel(name = "1时") + private double val01; + /** 2时;[01:00:00，01：59:59] */ - @ApiModelProperty(name = "2时",notes = "[01:00:00，01：59:59]") - private Double val02 ; + @Excel(name = "2时;[01:00:00，01：59:59]") + private double val02; + /** 3时;[02:00:00，02：59:59] */ - @ApiModelProperty(name = "3时",notes = "[02:00:00，02：59:59]") - private Double val03 ; + @Excel(name = "3时;[02:00:00，02：59:59]") + private double val03; + /** 4时 */ - @ApiModelProperty(name = "4时",notes = "") - private Double val04 ; + @Excel(name = "4时") + private double val04; + /** 5时 */ - @ApiModelProperty(name = "5时",notes = "") - private Double val05 ; + @Excel(name = "5时") + private double val05; + /** 6时 */ - @ApiModelProperty(name = "6时",notes = "") - private Double val06 ; + @Excel(name = "6时") + private double val06; + /** 7时 */ - @ApiModelProperty(name = "7时",notes = "") - private Double val07 ; + @Excel(name = "7时") + private double val07; + /** 8时 */ - @ApiModelProperty(name = "8时",notes = "") - private Double val08 ; + @Excel(name = "8时") + private double val08; + /** 9时 */ - @ApiModelProperty(name = "9时",notes = "") - private Double val09 ; + @Excel(name = "9时") + private double val09; + /** 10时 */ - @ApiModelProperty(name = "10时",notes = "") - private Double val10 ; + @Excel(name = "10时") + private double val10; + /** 11时 */ - @ApiModelProperty(name = "11时",notes = "") - private Double val11 ; + @Excel(name = "11时") + private double val11; + /** 12时 */ - @ApiModelProperty(name = "12时",notes = "") - private Double val12 ; + @Excel(name = "12时") + private double val12; + /** 13时 */ - @ApiModelProperty(name = "13时",notes = "") - private Double val13 ; + @Excel(name = "13时") + private double val13; + /** 14时 */ - @ApiModelProperty(name = "14时",notes = "") - private Double val14 ; + @Excel(name = "14时") + private double val14; + /** 15时 */ - @ApiModelProperty(name = "15时",notes = "") - private Double val15 ; + @Excel(name = "15时") + private double val15; + /** 16时 */ - @ApiModelProperty(name = "16时",notes = "") - private Double val16 ; + @Excel(name = "16时") + private double val16; + /** 17时 */ - @ApiModelProperty(name = "17时",notes = "") - private Double val17 ; + @Excel(name = "17时") + private double val17; + /** 18时 */ - @ApiModelProperty(name = "18时",notes = "") - private Double val18 ; + @Excel(name = "18时") + private double val18; + /** 18时 */ - @ApiModelProperty(name = "18时",notes = "") - private Double val19 ; + @Excel(name = "18时") + private double val19; + /** 20时 */ - @ApiModelProperty(name = "20时",notes = "") - private Double val20 ; + @Excel(name = "20时") + private double val20; + /** 21时 */ - @ApiModelProperty(name = "21时",notes = "") - private Double val21 ; + @Excel(name = "21时") + private double val21; + /** 22时 */ - @ApiModelProperty(name = "22时",notes = "") - private Double val22 ; + @Excel(name = "22时") + private double val22; + /** 23时 */ - @ApiModelProperty(name = "23时",notes = "") - private Double val23 ; + @Excel(name = "23时") + private double val23; + /** 24时 */ - @ApiModelProperty(name = "24时",notes = "") - private Double val24 ; + @Excel(name = "24时") + private double val24; + + /** 统计单元名称 */ + @Excel(name = "统计单元名称") + private String assetName; -} \ No newline at end of file +} diff --git a/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiTargetDraftMonth.java b/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiTargetDraftMonth.java new file mode 100644 index 0000000..cd1f44f --- /dev/null +++ b/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiTargetDraftMonth.java @@ -0,0 +1,230 @@ +package com.lzbi.draft.domain; + +import java.math.BigDecimal; +import java.util.Date; + +import lombok.Data; +import com.lzbi.common.annotation.Excel; +import com.lzbi.module.base.BaseModuleEntity; + +/** + * 指标数据底稿(月)对象 dc_busi_target_draft_month + * + * @author zhousq + * @date 2023-12-06 + */ +@Data +public class DcBusiTargetDraftMonth extends BaseModuleEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + private Long id; + + /** 公司名称 */ + @Excel(name = "公司名称") + private String companyName; + + /** 公司ID */ + private Long companyId; + + /** 组织机构ID */ + private Long orgId; + + /** 组织机构名称 */ + @Excel(name = "组织机构名称") + private String orgName; + + /** 统计单元编码 */ + @Excel(name = "统计单元编码") + private String assetCode; + + /** 统计单元名称 */ + @Excel(name = "统计单元名称") + private String assetName; + + /** 所属专业编码 */ + @Excel(name = "所属专业编码") + private String fieldCode; + + /** 所属专业名称 */ + @Excel(name = "所属专业名称") + private String fieldName; + + /** 指标别名 */ + @Excel(name = "指标别名") + private String targetNameAlias; + + /** 指标名称 */ + @Excel(name = "指标名称") + private String targetName; + + /** 指标编码 */ + @Excel(name = "指标编码") + private String targetCode; + + /** 指标单位 */ + @Excel(name = "指标单位") + private String targetUint; + + /** 年 */ + @Excel(name = "年") + private String countYear; + + /** 月 */ + @Excel(name = "月") + private String countMonth; + + /** 和值 */ + @Excel(name = "和值") + private BigDecimal valSum; + + /** 均值 */ + @Excel(name = "均值") + private BigDecimal valAvgAll; + + /** 非空均值 */ + @Excel(name = "非空均值") + private BigDecimal valAvgNull; + + /** 计划值 */ + @Excel(name = "计划值") + private BigDecimal valPlan; + + /** 创建人 */ + private String createdBy; + + /** 创建时间 */ + private Date createdTime; + + /** 更新人 */ + private String updatedBy; + + /** 更新时间 */ + private Date updatedTime; + + /** 1日 */ + @Excel(name = "1日") + private BigDecimal valP1; + + /** 2日 */ + @Excel(name = "2日") + private BigDecimal valP2; + + /** 3日 */ + @Excel(name = "3日") + private BigDecimal valP3; + + /** 4日 */ + @Excel(name = "4日") + private BigDecimal valP4; + + /** 5日 */ + @Excel(name = "5日") + private BigDecimal valP5; + + /** 6日 */ + @Excel(name = "6日") + private BigDecimal valP6; + + /** 7日 */ + @Excel(name = "7日") + private BigDecimal valP7; + + /** 8日 */ + @Excel(name = "8日") + private BigDecimal valP8; + + /** 9日 */ + @Excel(name = "9日") + private BigDecimal valP9; + + /** 10日 */ + @Excel(name = "10日") + private BigDecimal valP10; + + /** 11日 */ + @Excel(name = "11日") + private BigDecimal valP11; + + /** 12日 */ + @Excel(name = "12日") + private BigDecimal valP12; + + /** 13日 */ + @Excel(name = "13日") + private BigDecimal valP13; + + /** 14日 */ + @Excel(name = "14日") + private BigDecimal valP14; + + /** 15日 */ + @Excel(name = "15日") + private BigDecimal valP15; + + /** 16日 */ + @Excel(name = "16日") + private BigDecimal valP16; + + /** 17日 */ + @Excel(name = "17日") + private BigDecimal valP17; + + /** 18日 */ + @Excel(name = "18日") + private BigDecimal valP18; + + /** 19日 */ + @Excel(name = "19日") + private BigDecimal valP19; + + /** 20日 */ + @Excel(name = "20日") + private BigDecimal valP20; + + /** 21日 */ + @Excel(name = "21日") + private BigDecimal valP21; + + /** 22日 */ + @Excel(name = "22日") + private BigDecimal valP22; + + /** 23日 */ + @Excel(name = "23日") + private BigDecimal valP23; + + /** 24日 */ + @Excel(name = "24日") + private BigDecimal valP24; + + /** 25日 */ + @Excel(name = "25日") + private BigDecimal valP25; + + /** 26日 */ + @Excel(name = "26日") + private BigDecimal valP26; + + /** 27日 */ + @Excel(name = "27日") + private BigDecimal valP27; + + /** 28日 */ + @Excel(name = "28日") + private BigDecimal valP28; + + /** 29日 */ + @Excel(name = "29日") + private BigDecimal valP29; + + /** 30日 */ + @Excel(name = "30日") + private BigDecimal valP30; + + /** 31日 */ + @Excel(name = "31日") + private BigDecimal valP31; + +} diff --git a/lzbi-module/src/main/java/com/lzbi/draft/mapper/DcBusiParamDraftDayMapper.java b/lzbi-module/src/main/java/com/lzbi/draft/mapper/DcBusiParamDraftDayMapper.java index c3b139d..253f2e3 100644 --- a/lzbi-module/src/main/java/com/lzbi/draft/mapper/DcBusiParamDraftDayMapper.java +++ b/lzbi-module/src/main/java/com/lzbi/draft/mapper/DcBusiParamDraftDayMapper.java @@ -1,21 +1,65 @@ package com.lzbi.draft.mapper; -import com.baomidou.mybatisplus.annotation.InterceptorIgnore; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.List; import com.lzbi.draft.domain.DcBusiParamDraftDay; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.lzbi.draft.domain.ParamDraftQueryVo; -import java.util.List; - /** - * 参数数据底稿表（日）;(dc_busi_param_draft_day)表数据库访问层 - * @author : zhousq - * @date : 2023-12-1 + * 参数数据底稿（日）Mapper接口 + * + * @author zhousq + * @date 2023-12-06 */ -@InterceptorIgnore(tenantLine = "true") -public interface DcBusiParamDraftDayMapper extends BaseMapper{ - List selectByVo( DcBusiParamDraftDay beanVo); - int insertByVo( DcBusiParamDraftDay beanVo); - DcBusiParamDraftDay selectOneByParam( ParamDraftQueryVo beanVo); -} \ No newline at end of file +public interface DcBusiParamDraftDayMapper extends BaseMapper +{ + /** + * 查询参数数据底稿（日） + * + * @param id 参数数据底稿（日）主键 + * @return 参数数据底稿（日） + */ + public DcBusiParamDraftDay selectDcBusiParamDraftDayById(String id); + public DcBusiParamDraftDay selectOneByParam(ParamDraftQueryVo queryVo); + + /** + * 查询参数数据底稿（日）列表 + * + * @param dcBusiParamDraftDay 参数数据底稿（日） + * @return 参数数据底稿（日）集合 + */ + public List selectDcBusiParamDraftDayList(DcBusiParamDraftDay dcBusiParamDraftDay); + + /** + * 新增参数数据底稿（日） + * + * @param dcBusiParamDraftDay 参数数据底稿（日） + * @return 结果 + */ + public int insertDcBusiParamDraftDay(DcBusiParamDraftDay dcBusiParamDraftDay); + + /** + * 修改参数数据底稿（日） + * + * @param dcBusiParamDraftDay 参数数据底稿（日） + * @return 结果 + */ + public int updateDcBusiParamDraftDay(DcBusiParamDraftDay dcBusiParamDraftDay); + + /** + * 删除参数数据底稿（日） + * + * @param id 参数数据底稿（日）主键 + * @return 结果 + */ + public int deleteDcBusiParamDraftDayById(String id); + + /** + * 批量删除参数数据底稿（日） + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteDcBusiParamDraftDayByIds(String[] ids); +} diff --git a/lzbi-module/src/main/java/com/lzbi/draft/mapper/DcBusiTargetDraftMonthMapper.java b/lzbi-module/src/main/java/com/lzbi/draft/mapper/DcBusiTargetDraftMonthMapper.java new file mode 100644 index 0000000..4fe52a9 --- /dev/null +++ b/lzbi-module/src/main/java/com/lzbi/draft/mapper/DcBusiTargetDraftMonthMapper.java @@ -0,0 +1,63 @@ +package com.lzbi.draft.mapper; + +import java.util.List; +import com.lzbi.draft.domain.DcBusiTargetDraftMonth; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * 指标数据底稿(月)Mapper接口 + * + * @author zhousq + * @date 2023-12-06 + */ + +public interface DcBusiTargetDraftMonthMapper extends BaseMapper +{ + /** + * 查询指标数据底稿(月) + * + * @param id 指标数据底稿(月)主键 + * @return 指标数据底稿(月) + */ + public DcBusiTargetDraftMonth selectDcBusiTargetDraftMonthById(Long id); + + /** + * 查询指标数据底稿(月)列表 + * + * @param dcBusiTargetDraftMonth 指标数据底稿(月) + * @return 指标数据底稿(月)集合 + */ + public List selectDcBusiTargetDraftMonthList(DcBusiTargetDraftMonth dcBusiTargetDraftMonth); + + /** + * 新增指标数据底稿(月) + * + * @param dcBusiTargetDraftMonth 指标数据底稿(月) + * @return 结果 + */ + public int insertDcBusiTargetDraftMonth(DcBusiTargetDraftMonth dcBusiTargetDraftMonth); + + /** + * 修改指标数据底稿(月) + * + * @param dcBusiTargetDraftMonth 指标数据底稿(月) + * @return 结果 + */ + public int updateDcBusiTargetDraftMonth(DcBusiTargetDraftMonth dcBusiTargetDraftMonth); + + /** + * 删除指标数据底稿(月) + * + * @param id 指标数据底稿(月)主键 + * @return 结果 + */ + public int deleteDcBusiTargetDraftMonthById(Long id); + + /** + * 批量删除指标数据底稿(月) + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteDcBusiTargetDraftMonthByIds(Long[] ids); +} diff --git a/lzbi-module/src/main/java/com/lzbi/draft/service/DcBusiParamDraftDayService.java b/lzbi-module/src/main/java/com/lzbi/draft/service/DcBusiParamDraftDayService.java index 57d2aab..f984974 100644 --- a/lzbi-module/src/main/java/com/lzbi/draft/service/DcBusiParamDraftDayService.java +++ b/lzbi-module/src/main/java/com/lzbi/draft/service/DcBusiParamDraftDayService.java @@ -1,29 +1,96 @@ package com.lzbi.draft.service; -import com.baomidou.mybatisplus.extension.service.IService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.util.List; +import com.lzbi.common.utils.DateUtils; import com.lzbi.draft.domain.ParamDraftQueryVo; -import com.lzbi.draft.mapper.DcBusiParamDraftDayMapper; import org.springframework.stereotype.Service; import com.lzbi.draft.domain.DcBusiParamDraftDay; -import java.util.List; - +import com.lzbi.draft.mapper.DcBusiParamDraftDayMapper; +import com.baomidou.mybatisplus.extension.service.IService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** - * 参数数据底稿表（日）;(dc_busi_param_draft_day)表服务接口 - * @author : zhousq - * @date : 2023-12-1 + * 参数数据底稿（日）Service业务层处理 + * + * @author zhousq + * @date 2023-12-06 */ @Service -public class DcBusiParamDraftDayService extends ServiceImpl implements IService { +public class DcBusiParamDraftDayService extends ServiceImpl implements IService +{ - public List selectByVo( DcBusiParamDraftDay dcBusiParamDraftDay){ - return baseMapper.selectByVo(dcBusiParamDraftDay); + /** + * 查询参数数据底稿（日） + * + * @param id 参数数据底稿（日）主键 + * @return 参数数据底稿（日） + */ + public DcBusiParamDraftDay selectDcBusiParamDraftDayById(String id) + { + return baseMapper.selectDcBusiParamDraftDayById(id); } - public int insertByVo( DcBusiParamDraftDay dcBusiParamDraftDay){ - return baseMapper.insertByVo(dcBusiParamDraftDay); - } - public DcBusiParamDraftDay selectOneByParam(ParamDraftQueryVo queryVo){ + public DcBusiParamDraftDay selectOneByParam(ParamDraftQueryVo queryVo) + { return baseMapper.selectOneByParam(queryVo); } -} \ No newline at end of file + /** + * 查询参数数据底稿（日）列表 + * + * @param dcBusiParamDraftDay 参数数据底稿（日） + * @return 参数数据底稿（日） + */ + public List selectDcBusiParamDraftDayList(DcBusiParamDraftDay dcBusiParamDraftDay) + { + return baseMapper.selectDcBusiParamDraftDayList(dcBusiParamDraftDay); + } + + /** + * 新增参数数据底稿（日） + * + * @param dcBusiParamDraftDay 参数数据底稿（日） + * @return 结果 + */ + + public int insertDcBusiParamDraftDay(DcBusiParamDraftDay dcBusiParamDraftDay) + { + dcBusiParamDraftDay.setCreatedTime(DateUtils.getNowDate()); + return baseMapper.insertDcBusiParamDraftDay(dcBusiParamDraftDay); + } + + /** + * 修改参数数据底稿（日） + * + * @param dcBusiParamDraftDay 参数数据底稿（日） + * @return 结果 + */ + + public int updateDcBusiParamDraftDay(DcBusiParamDraftDay dcBusiParamDraftDay) + { + dcBusiParamDraftDay.setUpdatedTime(DateUtils.getNowDate()); + return baseMapper.updateDcBusiParamDraftDay(dcBusiParamDraftDay); + } + + /** + * 批量删除参数数据底稿（日） + * + * @param ids 需要删除的参数数据底稿（日）主键 + * @return 结果 + */ + + public int deleteDcBusiParamDraftDayByIds(String[] ids) + { + return baseMapper.deleteDcBusiParamDraftDayByIds(ids); + } + + /** + * 删除参数数据底稿（日）信息 + * + * @param id 参数数据底稿（日）主键 + * @return 结果 + */ + + public int deleteDcBusiParamDraftDayById(String id) + { + return baseMapper.deleteDcBusiParamDraftDayById(id); + } +} diff --git a/lzbi-module/src/main/java/com/lzbi/draft/service/DcBusiTargetDraftMonthService.java b/lzbi-module/src/main/java/com/lzbi/draft/service/DcBusiTargetDraftMonthService.java new file mode 100644 index 0000000..78564ff --- /dev/null +++ b/lzbi-module/src/main/java/com/lzbi/draft/service/DcBusiTargetDraftMonthService.java @@ -0,0 +1,91 @@ +package com.lzbi.draft.service; + +import java.util.List; +import com.lzbi.common.utils.DateUtils; +import org.springframework.stereotype.Service; +import com.lzbi.draft.domain.DcBusiTargetDraftMonth; +import com.lzbi.draft.mapper.DcBusiTargetDraftMonthMapper; +import com.baomidou.mybatisplus.extension.service.IService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +/** + * 指标数据底稿(月)Service业务层处理 + * + * @author zhousq + * @date 2023-12-06 + */ +@Service +public class DcBusiTargetDraftMonthService extends ServiceImpl implements IService +{ + + /** + * 查询指标数据底稿(月) + * + * @param id 指标数据底稿(月)主键 + * @return 指标数据底稿(月) + */ + public DcBusiTargetDraftMonth selectDcBusiTargetDraftMonthById(Long id) + { + return baseMapper.selectDcBusiTargetDraftMonthById(id); + } + + /** + * 查询指标数据底稿(月)列表 + * + * @param dcBusiTargetDraftMonth 指标数据底稿(月) + * @return 指标数据底稿(月) + */ + public List selectDcBusiTargetDraftMonthList(DcBusiTargetDraftMonth dcBusiTargetDraftMonth) + { + return baseMapper.selectDcBusiTargetDraftMonthList(dcBusiTargetDraftMonth); + } + + /** + * 新增指标数据底稿(月) + * + * @param dcBusiTargetDraftMonth 指标数据底稿(月) + * @return 结果 + */ + + public int insertDcBusiTargetDraftMonth(DcBusiTargetDraftMonth dcBusiTargetDraftMonth) + { + dcBusiTargetDraftMonth.setCreatedTime(DateUtils.getNowDate()); + return baseMapper.insertDcBusiTargetDraftMonth(dcBusiTargetDraftMonth); + } + + /** + * 修改指标数据底稿(月) + * + * @param dcBusiTargetDraftMonth 指标数据底稿(月) + * @return 结果 + */ + + public int updateDcBusiTargetDraftMonth(DcBusiTargetDraftMonth dcBusiTargetDraftMonth) + { + dcBusiTargetDraftMonth.setUpdatedTime(DateUtils.getNowDate()); + return baseMapper.updateDcBusiTargetDraftMonth(dcBusiTargetDraftMonth); + } + + /** + * 批量删除指标数据底稿(月) + * + * @param ids 需要删除的指标数据底稿(月)主键 + * @return 结果 + */ + + public int deleteDcBusiTargetDraftMonthByIds(Long[] ids) + { + return baseMapper.deleteDcBusiTargetDraftMonthByIds(ids); + } + + /** + * 删除指标数据底稿(月)信息 + * + * @param id 指标数据底稿(月)主键 + * @return 结果 + */ + + public int deleteDcBusiTargetDraftMonthById(Long id) + { + return baseMapper.deleteDcBusiTargetDraftMonthById(id); + } +} diff --git a/lzbi-module/src/main/java/com/lzbi/task/TaskParamDfratProcess.java b/lzbi-module/src/main/java/com/lzbi/task/TaskParamDfratProcess.java index bee919b..d275852 100644 --- a/lzbi-module/src/main/java/com/lzbi/task/TaskParamDfratProcess.java +++ b/lzbi-module/src/main/java/com/lzbi/task/TaskParamDfratProcess.java @@ -50,7 +50,7 @@ public class TaskParamDfratProcess { if(StringUtils.isNull(dcBusiParamDraftDay.getId())){ dcBusiParamDraftDay.setCreatedTime(DateUtil.date()); dcBusiParamDraftDay.setCreatedBy("task"); - dcBusiParamDraftDay.setParamField(val.getFieldType()); + dcBusiParamDraftDay.setParamFieldCode(val.getFieldType()); dcBusiParamDraftDay.setParamCode(val.getParamCode()); dcBusiParamDraftDay.setCountDate(val.getCountDate()); dcBusiParamDraftDay.setAssetCode(val.getAssetCode()); diff --git a/lzbi-module/src/main/resources/mapper/asset/DcBusiCoderuleConfigMapper.xml b/lzbi-module/src/main/resources/mapper/asset/DcBusiCoderuleConfigMapper.xml new file mode 100644 index 0000000..d7ca258 --- /dev/null +++ b/lzbi-module/src/main/resources/mapper/asset/DcBusiCoderuleConfigMapper.xml @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + + + select tenant_id, revision, created_by, created_time, updated_by, updated_time, delete_by, delete_time, id, config_name, node_code, column_name, rule_id from dc_busi_coderule_config + + + + + + + + insert into dc_busi_coderule_config + + tenant_id, + revision, + created_by, + created_time, + updated_by, + updated_time, + delete_by, + delete_time, + config_name, + node_code, + column_name, + rule_id, + + + #{tenantId}, + #{revision}, + #{createdBy}, + #{createdTime}, + #{updatedBy}, + #{updatedTime}, + #{deleteBy}, + #{deleteTime}, + #{configName}, + #{nodeCode}, + #{columnName}, + #{ruleId}, + + + + + update dc_busi_coderule_config + + tenant_id = #{tenantId}, + revision = #{revision}, + created_by = #{createdBy}, + created_time = #{createdTime}, + updated_by = #{updatedBy}, + updated_time = #{updatedTime}, + delete_by = #{deleteBy}, + delete_time = #{deleteTime}, + config_name = #{configName}, + node_code = #{nodeCode}, + column_name = #{columnName}, + rule_id = #{ruleId}, + + where id = #{id} + + + + delete from dc_busi_coderule_config where id = #{id} + + + + delete from dc_busi_coderule_config where id in + + #{id} + + + \ No newline at end of file diff --git a/lzbi-module/src/main/resources/mapper/asset/DcBusiParamDraftDayMapper.xml b/lzbi-module/src/main/resources/mapper/asset/DcBusiParamDraftDayMapper.xml index ddd1ccf..108f350 100644 --- a/lzbi-module/src/main/resources/mapper/asset/DcBusiParamDraftDayMapper.xml +++ b/lzbi-module/src/main/resources/mapper/asset/DcBusiParamDraftDayMapper.xml @@ -1,254 +1,124 @@ - +PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" +"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - select - tenant_id, - revision, - created_by, - created_time, - updated_by, - updated_time, - delete_by, - delete_time, - id, - company_code, - organize_name, - organize_code, - company_name, - asset_code, - asset_name, - param_code, - param_name, - param_field, - target_uint, - count_date, - val_avg, - val_max, - val_sum, - val_min, - val_integrating, - val_limit_up, - val_limit_down, - val01, - val02, - val03, - val04, - val05, - val06, - val07, - val08, - val09, - val10, - val11, - val12, - val13, - val14, - val15, - val16, - val17, - val18, - val19, - val20, - val21, - val22, - val23, - val24 - from dc_busi_param_draft_day + + + select tenant_id, revision, created_by, created_time, updated_by, updated_time, delete_by, delete_time, id, company_id, organize_name, organize_id, company_name, asset_code, param_code, param_name, param_field_code,param_field_name, target_uint, count_date, val_avg, val_max, val_sum, val_min, val_integrating, val_limit_up, val_limit_down, val01, val02, val03, val04, val05, val06, val07, val08, val09, val10, val11, val12, val13, val14, val15, val16, val17, val18, val19, val20, val21, val22, val23, val24, asset_name from dc_busi_param_draft_day - + + + and company_id = #{companyId} + and organize_id = #{organizeId} + and asset_code = #{assetCode} + and param_code = #{paramCode} + and param_name like concat('%', #{paramName}, '%') + and param_field_code = #{paramFieldCode} + and param_field_name like concat('%', #{paramFieldName}, '%') + and target_uint = #{targetUint} + and count_date = #{countDate} - + + + + + insert into dc_busi_param_draft_day - tenant_id, - revision, - created_by, - created_time, - updated_by, - updated_time, - delete_by, + tenant_id, + revision, + created_by, + created_time, + updated_by, + updated_time, + delete_by, delete_time, - company_code, - organize_name, - organize_code, - company_name, - asset_code, - asset_name, - param_code, - param_name, - param_field, - target_uint, - count_date, - val_avg, - val_max, - val_sum, - val_min, + company_id, + organize_name, + organize_id, + company_name, + asset_code, + param_code, + param_name, + param_field_code, + param_field_name, + target_uint, + count_date, + val_avg, + val_max, + val_sum, + val_min, val_integrating, - val_limit_up, - val_limit_down, + val_limit_up, + val_limit_down, val01, val02, val03, @@ -273,35 +143,35 @@ val22, val23, val24, - + asset_name, + - #{tenantId}, - #{revision}, - #{createdBy}, - #{createdTime}, - #{updatedBy}, - #{updatedTime}, - #{deleteBy}, - #{deleteTime}, - #{companyCode}, - #{organizeName}, - #{organizeCode}, - #{companyName}, - #{assetCode}, - #{assetName}, - #{paramCode}, - #{paramName}, - #{paramField}, - #{targetUint}, - #{countDate}, - #{valAvg}, - #{valMax}, - #{valSum}, - #{valMin}, - #{valIntegrating}, - #{valLimitUp}, + #{tenantId}, + #{revision}, + #{createdBy}, + #{createdTime}, + #{updatedBy}, + #{updatedTime}, + #{deleteBy}, + #{deleteTime}, + #{companyId}, + #{organizeName}, + #{organizeId}, + #{companyName}, + #{assetCode}, + #{paramCode}, + #{paramName}, + #{paramField}, + #{targetUint}, + #{countDate}, + #{valAvg}, + #{valMax}, + #{valSum}, + #{valMin}, + #{valIntegrating}, + #{valLimitUp}, #{valLimitDown}, - #{val01}, + #{val01}, #{val02}, #{val03}, #{val04}, @@ -325,16 +195,76 @@ #{val22}, #{val23}, #{val24}, - + #{assetName}, + - + + + update dc_busi_param_draft_day + + tenant_id = #{tenantId}, + revision = #{revision}, + created_by = #{createdBy}, + created_time = #{createdTime}, + updated_by = #{updatedBy}, + updated_time = #{updatedTime}, + delete_by = #{deleteBy}, + delete_time = #{deleteTime}, + company_id = #{companyId}, + organize_name = #{organizeName}, + organize_id = #{organizeId}, + company_name = #{companyName}, + asset_code = #{assetCode}, + param_code = #{paramCode}, + param_name = #{paramName}, + param_field_code = #{paramFieldCode}, + param_field_name = #{paramFieldName}, + target_uint = #{targetUint}, + count_date = #{countDate}, + val_avg = #{valAvg}, + val_max = #{valMax}, + val_sum = #{valSum}, + val_min = #{valMin}, + val_integrating = #{valIntegrating}, + val_limit_up = #{valLimitUp}, + val_limit_down = #{valLimitDown}, + val01 = #{val01}, + val02 = #{val02}, + val03 = #{val03}, + val04 = #{val04}, + val05 = #{val05}, + val06 = #{val06}, + val07 = #{val07}, + val08 = #{val08}, + val09 = #{val09}, + val10 = #{val10}, + val11 = #{val11}, + val12 = #{val12}, + val13 = #{val13}, + val14 = #{val14}, + val15 = #{val15}, + val16 = #{val16}, + val17 = #{val17}, + val18 = #{val18}, + val19 = #{val19}, + val20 = #{val20}, + val21 = #{val21}, + val22 = #{val22}, + val23 = #{val23}, + val24 = #{val24}, + asset_name = #{assetName}, + + where id = #{id} + + + + delete from dc_busi_param_draft_day where id = #{id} + + + + delete from dc_busi_param_draft_day where id in + + #{id} + + \ No newline at end of file diff --git a/lzbi-module/src/main/resources/mapper/draft/DcBusiTargetDraftMonthMapper.xml b/lzbi-module/src/main/resources/mapper/draft/DcBusiTargetDraftMonthMapper.xml new file mode 100644 index 0000000..763400c --- /dev/null +++ b/lzbi-module/src/main/resources/mapper/draft/DcBusiTargetDraftMonthMapper.xml @@ -0,0 +1,288 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, company_name, company_id, org_id, org_name, asset_code, asset_name, field_code, field_name, target_name_alias, target_name, target_code, target_uint, count_year, count_month, val_sum, val_avg_all, val_avg_null, val_plan, tenant_id, revision, created_by, created_time, updated_by, updated_time, delete_by, delete_time, val_p1, val_p2, val_p3, val_p4, val_p5, val_p6, val_p7, val_p8, val_p9, val_p10, val_p11, val_p12, val_p13, val_p14, val_p15, val_p16, val_p17, val_p18, val_p19, val_p20, val_p21, val_p22, val_p23, val_p24, val_p25, val_p26, val_p27, val_p28, val_p29, val_p30, val_p31 from dc_busi_target_draft_month + + + + + + + + insert into dc_busi_target_draft_month + + company_name, + company_id, + org_id, + org_name, + asset_code, + asset_name, + field_code, + field_name, + target_name_alias, + target_name, + target_code, + target_uint, + count_year, + count_month, + val_sum, + val_avg_all, + val_avg_null, + val_plan, + tenant_id, + revision, + created_by, + created_time, + updated_by, + updated_time, + delete_by, + delete_time, + val_p1, + val_p2, + val_p3, + val_p4, + val_p5, + val_p6, + val_p7, + val_p8, + val_p9, + val_p10, + val_p11, + val_p12, + val_p13, + val_p14, + val_p15, + val_p16, + val_p17, + val_p18, + val_p19, + val_p20, + val_p21, + val_p22, + val_p23, + val_p24, + val_p25, + val_p26, + val_p27, + val_p28, + val_p29, + val_p30, + val_p31, + + + #{companyName}, + #{companyId}, + #{orgId}, + #{orgName}, + #{assetCode}, + #{assetName}, + #{fieldCode}, + #{fieldName}, + #{targetNameAlias}, + #{targetName}, + #{targetCode}, + #{targetUint}, + #{countYear}, + #{countMonth}, + #{valSum}, + #{valAvgAll}, + #{valAvgNull}, + #{valPlan}, + #{tenantId}, + #{revision}, + #{createdBy}, + #{createdTime}, + #{updatedBy}, + #{updatedTime}, + #{deleteBy}, + #{deleteTime}, + #{valP1}, + #{valP2}, + #{valP3}, + #{valP4}, + #{valP5}, + #{valP6}, + #{valP7}, + #{valP8}, + #{valP9}, + #{valP10}, + #{valP11}, + #{valP12}, + #{valP13}, + #{valP14}, + #{valP15}, + #{valP16}, + #{valP17}, + #{valP18}, + #{valP19}, + #{valP20}, + #{valP21}, + #{valP22}, + #{valP23}, + #{valP24}, + #{valP25}, + #{valP26}, + #{valP27}, + #{valP28}, + #{valP29}, + #{valP30}, + #{valP31}, + + + + + update dc_busi_target_draft_month + + company_name = #{companyName}, + company_id = #{companyId}, + org_id = #{orgId}, + org_name = #{orgName}, + asset_code = #{assetCode}, + asset_name = #{assetName}, + field_code = #{fieldCode}, + field_name = #{fieldName}, + target_name_alias = #{targetNameAlias}, + target_name = #{targetName}, + target_code = #{targetCode}, + target_uint = #{targetUint}, + count_year = #{countYear}, + count_month = #{countMonth}, + val_sum = #{valSum}, + val_avg_all = #{valAvgAll}, + val_avg_null = #{valAvgNull}, + val_plan = #{valPlan}, + tenant_id = #{tenantId}, + revision = #{revision}, + created_by = #{createdBy}, + created_time = #{createdTime}, + updated_by = #{updatedBy}, + updated_time = #{updatedTime}, + delete_by = #{deleteBy}, + delete_time = #{deleteTime}, + val_p1 = #{valP1}, + val_p2 = #{valP2}, + val_p3 = #{valP3}, + val_p4 = #{valP4}, + val_p5 = #{valP5}, + val_p6 = #{valP6}, + val_p7 = #{valP7}, + val_p8 = #{valP8}, + val_p9 = #{valP9}, + val_p10 = #{valP10}, + val_p11 = #{valP11}, + val_p12 = #{valP12}, + val_p13 = #{valP13}, + val_p14 = #{valP14}, + val_p15 = #{valP15}, + val_p16 = #{valP16}, + val_p17 = #{valP17}, + val_p18 = #{valP18}, + val_p19 = #{valP19}, + val_p20 = #{valP20}, + val_p21 = #{valP21}, + val_p22 = #{valP22}, + val_p23 = #{valP23}, + val_p24 = #{valP24}, + val_p25 = #{valP25}, + val_p26 = #{valP26}, + val_p27 = #{valP27}, + val_p28 = #{valP28}, + val_p29 = #{valP29}, + val_p30 = #{valP30}, + val_p31 = #{valP31}, + + where id = #{id} + + + + delete from dc_busi_target_draft_month where id = #{id} + + + + delete from dc_busi_target_draft_month where id in + + #{id} + + + \ No newline at end of file