From fbcab957070d5eb492b62a8a78d8b85083da0244 Mon Sep 17 00:00:00 2001 From: zhousq Date: Thu, 30 Nov 2023 14:27:54 +0800 Subject: [PATCH] =?UTF-8?q?2023-11-30=20=E5=A2=9E=E5=8A=A0=E7=BC=96?= =?UTF-8?q?=E7=A0=81=E7=94=9F=E6=88=90=E5=8A=9F=E8=83=BD=EF=BC=8C=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E5=8F=82=E6=95=B0=E8=AF=BB=E5=8F=96=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 9 +- .../main/resources/vm/java/service.java.vm | 3 +- lzbi-module/pom.xml | 5 + .../DcBusiWorkReadConfigController.java | 142 ++++++++++++ .../asset/domain/DcBusiWorkReadConfig.java | 52 +++++ .../mapper/DcBusiWorkReadConfigMapper.java | 17 ++ .../service/DcBusiWorkReadConfigService.java | 25 +++ .../DcBaseCoderuleDefineController.java | 124 +++++++++++ .../code/domain/DcBaseCoderuleDefineDao.java | 51 +++++ .../code/domain/DcBaseCoderuleSerialDao.java | 38 ++++ .../code/domain/DcBusiCoderuleConfigDao.java | 44 ++++ .../com/lzbi/code/domain/codeBodyType.java | 40 ++++ .../mapper/DcBaseCoderuleDefineMapper.java | 69 ++++++ .../lzbi/code/service/CodeNoGenerater.java | 86 ++++++++ .../service/DcBaseCoderuleDefineService.java | 109 ++++++++++ .../DcBusiParamBillMasterController.java | 2 +- .../lzbi/module/base/BaseModuleEntity.java | 5 +- .../controller/CodeRuleDefineController.java | 102 --------- .../controller/CodeRuleSerialController.java | 138 ------------ .../lzbi/serial/domain/CodeRuleDefine.java | 52 ----- .../lzbi/serial/domain/CodeRuleSerial.java | 48 ---- .../serial/mapper/CodeRuleDefineMapper.java | 66 ------ .../serial/mapper/CodeRuleSerialMapper.java | 77 ------- .../serial/service/CodeRuleDefineService.java | 105 --------- .../serial/service/CodeRuleSerialService.java | 112 ---------- .../lzbi/task/domain/EumValueReadType.java | 44 ++++ .../com/lzbi/task/domain/ReadQueryParams.java | 18 ++ .../com/lzbi/task/domain/WorkParamInfo.java | 39 ++++ .../java/com/lzbi/task/domain/WorkReadVo.java | 143 ++++++++++++ .../lzbi/task/mapper/WorkParamReadMapper.java | 23 ++ .../task/service/WorkParamReadService.java | 40 ++++ .../asset/DcBaseCoderuleDefineMapper.xml | 205 ++++++++++++++++++ .../asset/DcBusiWorkReadConfigMapper.xml | 123 +++++++++++ .../mapper/asset/WorkParamReadMapper.xml | 42 ++++ .../mapper/serial/CodeRuleDefineMapper.xml | 93 -------- .../mapper/serial/CodeRuleSerialMapper.xml | 99 --------- 36 files changed, 1490 insertions(+), 900 deletions(-) create mode 100644 lzbi-module/src/main/java/com/lzbi/asset/controller/DcBusiWorkReadConfigController.java create mode 100644 lzbi-module/src/main/java/com/lzbi/asset/domain/DcBusiWorkReadConfig.java create mode 100644 lzbi-module/src/main/java/com/lzbi/asset/mapper/DcBusiWorkReadConfigMapper.java create mode 100644 lzbi-module/src/main/java/com/lzbi/asset/service/DcBusiWorkReadConfigService.java create mode 100644 lzbi-module/src/main/java/com/lzbi/code/controller/DcBaseCoderuleDefineController.java create mode 100644 lzbi-module/src/main/java/com/lzbi/code/domain/DcBaseCoderuleDefineDao.java create mode 100644 lzbi-module/src/main/java/com/lzbi/code/domain/DcBaseCoderuleSerialDao.java create mode 100644 lzbi-module/src/main/java/com/lzbi/code/domain/DcBusiCoderuleConfigDao.java create mode 100644 lzbi-module/src/main/java/com/lzbi/code/domain/codeBodyType.java create mode 100644 lzbi-module/src/main/java/com/lzbi/code/mapper/DcBaseCoderuleDefineMapper.java create mode 100644 lzbi-module/src/main/java/com/lzbi/code/service/CodeNoGenerater.java create mode 100644 lzbi-module/src/main/java/com/lzbi/code/service/DcBaseCoderuleDefineService.java delete mode 100644 lzbi-module/src/main/java/com/lzbi/serial/controller/CodeRuleDefineController.java delete mode 100644 lzbi-module/src/main/java/com/lzbi/serial/controller/CodeRuleSerialController.java delete mode 100644 lzbi-module/src/main/java/com/lzbi/serial/domain/CodeRuleDefine.java delete mode 100644 lzbi-module/src/main/java/com/lzbi/serial/domain/CodeRuleSerial.java delete mode 100644 lzbi-module/src/main/java/com/lzbi/serial/mapper/CodeRuleDefineMapper.java delete mode 100644 lzbi-module/src/main/java/com/lzbi/serial/mapper/CodeRuleSerialMapper.java delete mode 100644 lzbi-module/src/main/java/com/lzbi/serial/service/CodeRuleDefineService.java delete mode 100644 lzbi-module/src/main/java/com/lzbi/serial/service/CodeRuleSerialService.java create mode 100644 lzbi-module/src/main/java/com/lzbi/task/domain/EumValueReadType.java create mode 100644 lzbi-module/src/main/java/com/lzbi/task/domain/ReadQueryParams.java create mode 100644 lzbi-module/src/main/java/com/lzbi/task/domain/WorkParamInfo.java create mode 100644 lzbi-module/src/main/java/com/lzbi/task/domain/WorkReadVo.java create mode 100644 lzbi-module/src/main/java/com/lzbi/task/mapper/WorkParamReadMapper.java create mode 100644 lzbi-module/src/main/java/com/lzbi/task/service/WorkParamReadService.java create mode 100644 lzbi-module/src/main/resources/mapper/asset/DcBaseCoderuleDefineMapper.xml create mode 100644 lzbi-module/src/main/resources/mapper/asset/DcBusiWorkReadConfigMapper.xml create mode 100644 lzbi-module/src/main/resources/mapper/asset/WorkParamReadMapper.xml delete mode 100644 lzbi-module/src/main/resources/mapper/serial/CodeRuleDefineMapper.xml delete mode 100644 lzbi-module/src/main/resources/mapper/serial/CodeRuleSerialMapper.xml diff --git a/lzbi-admin/src/main/resources/application-dev.yml b/lzbi-admin/src/main/resources/application-dev.yml index 79b65c0..373a956 100644 --- a/lzbi-admin/src/main/resources/application-dev.yml +++ b/lzbi-admin/src/main/resources/application-dev.yml @@ -35,11 +35,18 @@ spring: url: jdbc:mysql://10.10.10.56:13306/lzdc_bi_db?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: luenmei password: 123456 - # 主库数据源 + # 计费数据库 charge: url: jdbc:oracle:thin:@//10.10.10.60:1521/HX?CONNECT_TIMEOUT=10000&Read_Timeout=120000 username: lmjt_sys password: lmjt_sys + # 计费数据库 + workDB: + driverClassName: org.postgresql.Driver + type: com.alibaba.druid.pool.DruidDataSource + url: jdbc:postgresql://10.10.10.56:5432/dctestdb?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=Asia/Shanghai + username: postgres + password: 123456 # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/lzbi-generator/src/main/resources/vm/java/service.java.vm b/lzbi-generator/src/main/resources/vm/java/service.java.vm index d526785..8c3c6b4 100644 --- a/lzbi-generator/src/main/resources/vm/java/service.java.vm +++ b/lzbi-generator/src/main/resources/vm/java/service.java.vm @@ -2,12 +2,11 @@ package ${packageName}.service; import java.util.List; #foreach ($column in $columns) -#if($column.javaField == 'createTime' || $column.javaField == 'updateTime') +#if($column.javaField == 'createdTime' || $column.javaField == 'updatedTime') import com.lzbi.common.utils.DateUtils; #break #end #end -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; #if($table.sub) import java.util.ArrayList; diff --git a/lzbi-module/pom.xml b/lzbi-module/pom.xml index 13e7b51..0d75fe6 100644 --- a/lzbi-module/pom.xml +++ b/lzbi-module/pom.xml @@ -46,6 +46,11 @@ mysql mysql-connector-java + + com.baomidou + dynamic-datasource-spring-boot-starter + 3.6.1 + \ No newline at end of file diff --git a/lzbi-module/src/main/java/com/lzbi/asset/controller/DcBusiWorkReadConfigController.java b/lzbi-module/src/main/java/com/lzbi/asset/controller/DcBusiWorkReadConfigController.java new file mode 100644 index 0000000..a92abbb --- /dev/null +++ b/lzbi-module/src/main/java/com/lzbi/asset/controller/DcBusiWorkReadConfigController.java @@ -0,0 +1,142 @@ +package com.lzbi.asset.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.lzbi.code.service.CodeNoGenerater; +import com.lzbi.common.annotation.Log; +import com.lzbi.common.core.controller.BaseController; +import com.lzbi.common.core.domain.AjaxResult; +import com.lzbi.common.core.page.TableDataInfo; +import com.lzbi.common.enums.BusinessType; +import com.lzbi.common.utils.DateUtils; +import com.lzbi.common.utils.poi.ExcelUtil; +import com.lzbi.task.service.WorkParamReadService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import org.springframework.web.bind.annotation.*; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; +import com.lzbi.asset.domain.DcBusiWorkReadConfig; +import com.lzbi.asset.service.DcBusiWorkReadConfigService; + +/** + * 互联参数读取数据对照表;(dc_busi_work_read_config)表控制层 + * @author : zhousq + * @date : 2023-11-30 + */ +@Api(tags = "互联参数读取数据对照表对象功能接口") +@RestController +@RequestMapping("/asset/dcBusiWorkReadConfig") +public class DcBusiWorkReadConfigController extends BaseController{ + @Autowired + private DcBusiWorkReadConfigService dcBusiWorkReadConfigService; + + /** + * 分页列表查询 + * @return 分页数据 + */ + @GetMapping("/list") + public TableDataInfo list(DcBusiWorkReadConfig dcBusiWorkReadConfig) + { startPage(); + List list = null; + return getDataTable(list); + } + /** + *根据ID获取详情 + *@param id + @return DcBusiWorkReadConfig 没有反馈空 + */ + @ApiOperation("根据ID获取互联参数读取数据对照表详细信息") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + return AjaxResult.success(dcBusiWorkReadConfigService.getById(id)); + } + /** + * 互联参数读取数据对照表-新增 + *@param + *@return DcBusiWorkReadConfig + */ + @ApiOperation("新增互联参数读取数据对照表一条数据") + @Log(title = "", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@Valid @RequestBody DcBusiWorkReadConfig dcBusiWorkReadConfig) { + //BeanValidators.validateWithException(validator, dcBusiWorkReadConfig); + dcBusiWorkReadConfig.setCreatedBy(getUsername()); + dcBusiWorkReadConfig.setCreatedTime(DateUtils.getNowDate()); + dcBusiWorkReadConfig.setTenantId("0"); + dcBusiWorkReadConfig.setUpdatedBy(getUsername()); + dcBusiWorkReadConfig.setUpdatedTime(DateUtils.getNowDate()); + return toAjax(true); + } + /** + * 互联参数读取数据对照表-修改 + *@param + *@return DcBusiWorkReadConfig + */ + @ApiOperation("互联参数读取数据对照表修改") + @Log(title = "", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@Valid @RequestBody DcBusiWorkReadConfig dcBusiWorkReadConfig) { + //BeanValidators.validateWithException(validator, dcBusiWorkReadConfig); + dcBusiWorkReadConfig.setUpdatedBy(getUsername()); + dcBusiWorkReadConfig.setUpdatedTime(DateUtils.getNowDate()); + return toAjax(dcBusiWorkReadConfigService.updateById(dcBusiWorkReadConfig)); + } + /** + * 通过ID删除互联参数读取数据对照表 + * @param id + * @return 成功1 失败0 + */ + @ApiOperation("根据ID删除互联参数读取数据对照表") + @Log(title = "单一互联参数读取数据对照表", businessType = BusinessType.DELETE) + @DeleteMapping("/id/{id}") + public AjaxResult batchRemove(@PathVariable Long id) { + DcBusiWorkReadConfig dcBusiWorkReadConfig=new DcBusiWorkReadConfig(); + dcBusiWorkReadConfig.setId(id); + return toAjax(dcBusiWorkReadConfigService.removeById( dcBusiWorkReadConfig)); + } + /** + * 批量删除互联参数读取数据对照表 + * @param ids 数组 + * @return 删除的条数 + */ + @ApiOperation("批量删除互联参数读取数据对照表") + @Log(title = "批量删除互联参数读取数据对照表", businessType = BusinessType.DELETE) + @DeleteMapping("/ids/{ids}") + public AjaxResult batchRemove(@PathVariable Long[] ids) { + List collect = Arrays.stream(ids).collect(Collectors.toList()); + return toAjax(dcBusiWorkReadConfigService.removeBatchByIds(collect)); + } + /** + * 通过模版导入"互联参数读取数据对照表数据 + * + */ + @ApiOperation("互联参数读取数据对照表数据导入") + @PostMapping("/importTemplate") + public void importTemplate(HttpServletResponse response) { + ExcelUtil util = new ExcelUtil<>(DcBusiWorkReadConfig.class); + util.importTemplateExcel(response, "互联参数读取数据对照表导出数据"); + } + /** + * "互联参数读取数据对照表数据导出功能 + */ + @ApiOperation("导出互联参数读取数据对照表数据") + @PostMapping("/export") + public void export(HttpServletResponse response, DcBusiWorkReadConfig dcBusiWorkReadConfig) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + List list = dcBusiWorkReadConfigService.list(queryWrapper); + ExcelUtil util = new ExcelUtil<>(DcBusiWorkReadConfig.class); + util.exportExcel(response, list, "导出的互联参数读取数据对照表数据"); + } + @Autowired + WorkParamReadService workParamReadService; + @Autowired + CodeNoGenerater codeNoGenerater; + @GetMapping("/getWork") + public AjaxResult getWorkParamValue(){ + return success(); + } +} \ No newline at end of file diff --git a/lzbi-module/src/main/java/com/lzbi/asset/domain/DcBusiWorkReadConfig.java b/lzbi-module/src/main/java/com/lzbi/asset/domain/DcBusiWorkReadConfig.java new file mode 100644 index 0000000..8f00413 --- /dev/null +++ b/lzbi-module/src/main/java/com/lzbi/asset/domain/DcBusiWorkReadConfig.java @@ -0,0 +1,52 @@ +package com.lzbi.asset.domain; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableId; +import java.util.Date; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; +import com.lzbi.module.base.BaseModuleEntity; + +/** + * 互联参数读取数据对照表; + * @author : zhousq + * @date : 2023-11-30 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Accessors(chain = true) +@ApiModel(value = "互联参数读取数据对照表",description = "") +@TableName("dc_busi_work_read_config") +public class DcBusiWorkReadConfig extends BaseModuleEntity{ + /** 主键 */ + @ApiModelProperty(name = "主键",notes = "") + @TableId + private Long id ; + /** 统计单元编码 */ + @ApiModelProperty(name = "统计单元编码",notes = "") + private String assetCode ; + /** 统计单元参数编码 */ + @ApiModelProperty(name = "统计单元参数编码",notes = "") + private String assetParamCode ; + /** 目标参数编码 */ + @ApiModelProperty(name = "目标参数编码",notes = "") + private String goalParamCode ; + /** 目标参数辅助查询参数1 */ + @ApiModelProperty(name = "目标参数辅助查询参数1",notes = "") + private String goalParamExt1 ; + /** 目标参数辅助查询参数2 */ + @ApiModelProperty(name = "目标参数辅助查询参数2",notes = "") + private String goalParamExt2 ; + /** 读取数值类型 */ + @ApiModelProperty(name = "读取数值类型",notes = "") + private String goalParamType ; + /** 数据来源;生产IOT：work;计费：charge；Erp：erp */ + @ApiModelProperty(name = "数据来源",notes = "生产IOT：work;计费：charge；Erp：erp") + private String goalSource ; + +} \ No newline at end of file diff --git a/lzbi-module/src/main/java/com/lzbi/asset/mapper/DcBusiWorkReadConfigMapper.java b/lzbi-module/src/main/java/com/lzbi/asset/mapper/DcBusiWorkReadConfigMapper.java new file mode 100644 index 0000000..2f179ad --- /dev/null +++ b/lzbi-module/src/main/java/com/lzbi/asset/mapper/DcBusiWorkReadConfigMapper.java @@ -0,0 +1,17 @@ +package com.lzbi.asset.mapper; + +import com.baomidou.mybatisplus.annotation.InterceptorIgnore; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.lzbi.asset.domain.DcBusiWorkReadConfig; +import java.util.List; + +/** + * 互联参数读取数据对照表;(dc_busi_work_read_config)表数据库访问层 + * @author : zhousq + * @date : 2023-11-30 + */ +@InterceptorIgnore(tenantLine = "true") +public interface DcBusiWorkReadConfigMapper extends BaseMapper{ + List selectByVo( DcBusiWorkReadConfig beanVo); + int insertByVo( DcBusiWorkReadConfig beanVo); +} \ No newline at end of file diff --git a/lzbi-module/src/main/java/com/lzbi/asset/service/DcBusiWorkReadConfigService.java b/lzbi-module/src/main/java/com/lzbi/asset/service/DcBusiWorkReadConfigService.java new file mode 100644 index 0000000..c9bf374 --- /dev/null +++ b/lzbi-module/src/main/java/com/lzbi/asset/service/DcBusiWorkReadConfigService.java @@ -0,0 +1,25 @@ +package com.lzbi.asset.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.lzbi.asset.mapper.DcBusiWorkReadConfigMapper; +import org.springframework.stereotype.Service; +import com.lzbi.asset.domain.DcBusiWorkReadConfig; +import java.util.List; + +/** + * 互联参数读取数据对照表;(dc_busi_work_read_config)表服务接口 + * @author : zhousq + * @date : 2023-11-30 + */ +@Service +public class DcBusiWorkReadConfigService extends ServiceImpl implements IService { + + public List selectByVo( DcBusiWorkReadConfig dcBusiWorkReadConfig){ + return baseMapper.selectByVo(dcBusiWorkReadConfig); + } + public int insertByVo( DcBusiWorkReadConfig dcBusiWorkReadConfig){ + return baseMapper.insertByVo(dcBusiWorkReadConfig); + } + +} \ No newline at end of file diff --git a/lzbi-module/src/main/java/com/lzbi/code/controller/DcBaseCoderuleDefineController.java b/lzbi-module/src/main/java/com/lzbi/code/controller/DcBaseCoderuleDefineController.java new file mode 100644 index 0000000..ff1910d --- /dev/null +++ b/lzbi-module/src/main/java/com/lzbi/code/controller/DcBaseCoderuleDefineController.java @@ -0,0 +1,124 @@ +package com.lzbi.code.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import com.lzbi.code.domain.DcBusiCoderuleConfigDao; +import com.lzbi.code.service.CodeNoGenerater; +import com.lzbi.common.utils.StringUtils; +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.DcBaseCoderuleDefineDao; +import com.lzbi.code.service.DcBaseCoderuleDefineService; +import com.lzbi.common.utils.poi.ExcelUtil; +import com.lzbi.common.core.page.TableDataInfo; + +/** + * 编码规则定义Controller + * + * @author win + * @date 2023-11-29 + */ +@RestController +@RequestMapping("/asset/codeDefine") +public class DcBaseCoderuleDefineController extends BaseController +{ + @Autowired + private DcBaseCoderuleDefineService dcBaseCoderuleDefineService; + @Autowired + private CodeNoGenerater codeNoGenerater; + /** + * 查询编码规则定义列表 + */ + @PreAuthorize("@ss.hasPermi('asset:codeDefine:list')") + @GetMapping("/list") + public TableDataInfo list(DcBaseCoderuleDefineDao dcBaseCoderuleDefineDao) + { + startPage(); + List list = dcBaseCoderuleDefineService.selectDcBaseCoderuleDefineDaoList(dcBaseCoderuleDefineDao); + return getDataTable(list); + } + + /** + * 导出编码规则定义列表 + */ + @PreAuthorize("@ss.hasPermi('asset:codeDefine:export')") + @Log(title = "编码规则定义", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, DcBaseCoderuleDefineDao dcBaseCoderuleDefineDao) + { + List list = dcBaseCoderuleDefineService.selectDcBaseCoderuleDefineDaoList(dcBaseCoderuleDefineDao); + ExcelUtil util = new ExcelUtil(DcBaseCoderuleDefineDao.class); + util.exportExcel(response, list, "编码规则定义数据"); + } + + /** + * 获取编码规则定义详细信息 + */ + @PreAuthorize("@ss.hasPermi('asset:codeDefine:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(dcBaseCoderuleDefineService.selectDcBaseCoderuleDefineDaoById(id)); + } + + /** + * 新增编码规则定义 + */ + @PreAuthorize("@ss.hasPermi('asset:codeDefine:add')") + @Log(title = "编码规则定义", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody DcBaseCoderuleDefineDao dcBaseCoderuleDefineDao) + { + return toAjax(dcBaseCoderuleDefineService.insertDcBaseCoderuleDefineDao(dcBaseCoderuleDefineDao)); + } + + /** + * 修改编码规则定义 + */ + @PreAuthorize("@ss.hasPermi('asset:codeDefine:edit')") + @Log(title = "编码规则定义", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody DcBaseCoderuleDefineDao dcBaseCoderuleDefineDao) + { + return toAjax(dcBaseCoderuleDefineService.updateDcBaseCoderuleDefineDao(dcBaseCoderuleDefineDao)); + } + + /** + * 删除编码规则定义 + */ + @PreAuthorize("@ss.hasPermi('asset:codeDefine:remove')") + @Log(title = "编码规则定义", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(dcBaseCoderuleDefineService.deleteDcBaseCoderuleDefineDaoByIds(ids)); + } + @GetMapping(value = "/coder/{busiCode}") + public AjaxResult getInfo(@PathVariable("busiCode") String busiCode) + { + //根据业务编码获取规则定义 + DcBusiCoderuleConfigDao ruleIdByBusicode = dcBaseCoderuleDefineService.getRuleIdByBusicode(busiCode); + DcBaseCoderuleDefineDao ruleDao = dcBaseCoderuleDefineService.selectDcBaseCoderuleDefineDaoById(ruleIdByBusicode.getRuleId()); + String code=codeNoGenerater.getCode(ruleDao); + //解析规则，获取编码 + if(StringUtils.isNull(code)){ + return AjaxResult.error("获取编码失败！请确认配置或者稍后重试！"); + } + return AjaxResult.success(code); + } + + +} diff --git a/lzbi-module/src/main/java/com/lzbi/code/domain/DcBaseCoderuleDefineDao.java b/lzbi-module/src/main/java/com/lzbi/code/domain/DcBaseCoderuleDefineDao.java new file mode 100644 index 0000000..23b0c55 --- /dev/null +++ b/lzbi-module/src/main/java/com/lzbi/code/domain/DcBaseCoderuleDefineDao.java @@ -0,0 +1,51 @@ +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 win + * @date 2023-11-29 + */ + @Data +public class DcBaseCoderuleDefineDao extends BaseModuleEntity +{ + private static final long serialVersionUID = 1L; + /** 配置ID */ + private Long id; + /** */ + private Long deptId; + /** 配置名称 */ + @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/DcBaseCoderuleSerialDao.java b/lzbi-module/src/main/java/com/lzbi/code/domain/DcBaseCoderuleSerialDao.java new file mode 100644 index 0000000..c3bcbab --- /dev/null +++ b/lzbi-module/src/main/java/com/lzbi/code/domain/DcBaseCoderuleSerialDao.java @@ -0,0 +1,38 @@ +package com.lzbi.code.domain; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableId; +import java.util.Date; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; +import com.lzbi.module.base.BaseModuleEntity; + +/** + * 编码规则流水号表; + * @author : zhousq + * @date : 2023-11-29 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Accessors(chain = true) +@ApiModel(value = "编码规则流水号表",description = "") +@TableName("dc_base_coderule_serial") +public class DcBaseCoderuleSerialDao extends BaseModuleEntity{ + + /** 主键 */ + @ApiModelProperty(name = "主键",notes = "") + @TableId + private Integer id ; + /** 规则定义的ID */ + @ApiModelProperty(name = "规则定义的ID",notes = "") + private Long codeRuleId ; + /** 流水号 */ + @ApiModelProperty(name = "流水号",notes = "") + private Long serialId ; + +} \ No newline at end of file diff --git a/lzbi-module/src/main/java/com/lzbi/code/domain/DcBusiCoderuleConfigDao.java b/lzbi-module/src/main/java/com/lzbi/code/domain/DcBusiCoderuleConfigDao.java new file mode 100644 index 0000000..031b4e9 --- /dev/null +++ b/lzbi-module/src/main/java/com/lzbi/code/domain/DcBusiCoderuleConfigDao.java @@ -0,0 +1,44 @@ +package com.lzbi.code.domain; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableId; +import java.util.Date; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; +import com.lzbi.module.base.BaseModuleEntity; + +/** + * 业务编码规则配置; + * @author : zhousq + * @date : 2023-11-29 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Accessors(chain = true) +@ApiModel(value = "业务编码规则配置",description = "") +@TableName("dc_busi_coderule_config") +public class DcBusiCoderuleConfigDao extends BaseModuleEntity{ + + /** 主键 */ + @ApiModelProperty(name = "主键",notes = "") + @TableId + private Integer id ; + /** 规则名称 */ + @ApiModelProperty(name = "规则名称",notes = "") + private String configName ; + /** 业务代码 */ + @ApiModelProperty(name = "业务代码",notes = "") + private String nodeCode ; + /** 字段名称 */ + @ApiModelProperty(name = "字段名称",notes = "") + private String columnName ; + /** 规则ID */ + @ApiModelProperty(name = "规则ID",notes = "") + private Long ruleId ; + +} \ No newline at end of file diff --git a/lzbi-module/src/main/java/com/lzbi/code/domain/codeBodyType.java b/lzbi-module/src/main/java/com/lzbi/code/domain/codeBodyType.java new file mode 100644 index 0000000..e64f1ff --- /dev/null +++ b/lzbi-module/src/main/java/com/lzbi/code/domain/codeBodyType.java @@ -0,0 +1,40 @@ +package com.lzbi.code.domain; + +/** + * 业务操作类型 + * + * @author ruoyi + */ +public enum codeBodyType +{ + /** + * 日期类型 + */ + DATETYPE("dateType"), + + /** + * 用户定义 + */ + USERDEFINE("userDefine"), + + /** + * 不设置 + */ + NOBODY("noBody"), + + /** + * 部门编码默认四位+ + */ + DEPTCODE("deptCode"), + ; + private final String type; + codeBodyType (String type){ + this.type=type; + } + @Override + public String toString(){ + return this.type; + } + + +} diff --git a/lzbi-module/src/main/java/com/lzbi/code/mapper/DcBaseCoderuleDefineMapper.java b/lzbi-module/src/main/java/com/lzbi/code/mapper/DcBaseCoderuleDefineMapper.java new file mode 100644 index 0000000..fb64720 --- /dev/null +++ b/lzbi-module/src/main/java/com/lzbi/code/mapper/DcBaseCoderuleDefineMapper.java @@ -0,0 +1,69 @@ +package com.lzbi.code.mapper; + +import java.util.List; +import com.lzbi.code.domain.DcBaseCoderuleDefineDao; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.lzbi.code.domain.DcBaseCoderuleSerialDao; +import com.lzbi.code.domain.DcBusiCoderuleConfigDao; + +/** + * 编码规则定义Mapper接口 + * + * @author win + * @date 2023-11-29 + */ + +public interface DcBaseCoderuleDefineMapper extends BaseMapper +{ + /** + * 查询编码规则定义 + * + * @param id 编码规则定义主键 + * @return 编码规则定义 + */ + public DcBaseCoderuleDefineDao selectDcBaseCoderuleDefineDaoById(Long id); + + /** + * 查询编码规则定义列表 + * + * @param dcBaseCoderuleDefineDao 编码规则定义 + * @return 编码规则定义集合 + */ + public List selectDcBaseCoderuleDefineDaoList(DcBaseCoderuleDefineDao dcBaseCoderuleDefineDao); + + /** + * 新增编码规则定义 + * + * @param dcBaseCoderuleDefineDao 编码规则定义 + * @return 结果 + */ + public int insertDcBaseCoderuleDefineDao(DcBaseCoderuleDefineDao dcBaseCoderuleDefineDao); + + /** + * 修改编码规则定义 + * + * @param dcBaseCoderuleDefineDao 编码规则定义 + * @return 结果 + */ + public int updateDcBaseCoderuleDefineDao(DcBaseCoderuleDefineDao dcBaseCoderuleDefineDao); + + /** + * 删除编码规则定义 + * + * @param id 编码规则定义主键 + * @return 结果 + */ + public int deleteDcBaseCoderuleDefineDaoById(Long id); + + /** + * 批量删除编码规则定义 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteDcBaseCoderuleDefineDaoByIds(Long[] ids); + + public DcBaseCoderuleSerialDao getSerialByRuleId(Long rid); + public int updateSerial(long revision ,long serial,long id); + public DcBusiCoderuleConfigDao getRuleIdByBusicode(String busiCode); +} 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 new file mode 100644 index 0000000..d939aac --- /dev/null +++ b/lzbi-module/src/main/java/com/lzbi/code/service/CodeNoGenerater.java @@ -0,0 +1,86 @@ +package com.lzbi.code.service; + +import cn.hutool.core.date.DateUtil; +import com.lzbi.code.domain.DcBaseCoderuleDefineDao; +import com.lzbi.code.domain.DcBaseCoderuleSerialDao; +import com.lzbi.code.domain.codeBodyType; +import com.lzbi.common.utils.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Optional; + +/** + * @auth create by Administrator + * @date 2023/11/30 + * CodeNoGenerater + */ +@Service +public class CodeNoGenerater { + @Autowired + DcBaseCoderuleDefineService dcBaseCoderuleDefineService; + /** + * 根据规则获取编码 + * */ + public String getCode(DcBaseCoderuleDefineDao ruleDao){ + if(StringUtils.isNull(ruleDao)){ + return null; + }else{ + + String serial=getSerial(ruleDao.getId()); + if(StringUtils.isNull(serial)){ + return null; + } + int serialLen=ruleDao.getCodeSerialLength().intValue(); + StringBuilder codeBuffer=new StringBuilder(); + // + String spitChar= Optional.ofNullable(ruleDao.getCodeSplitFlag()).orElse(""); + codeBuffer.append(ruleDao.getCodeHeader()).append(spitChar).append(getBody(ruleDao)).append(spitChar).append(StringUtils.leftPad(serial,serialLen,'0')); + return codeBuffer.toString(); + } + + } + private String getBody(DcBaseCoderuleDefineDao ruleDao){ + if (ruleDao.getCodeBodyType().equals(codeBodyType.USERDEFINE.toString())){ + return Optional.ofNullable(ruleDao.getCodeBodyType()).orElse(""); + } + if (ruleDao.getCodeBodyType().equals(codeBodyType.NOBODY.toString())){ + return ""; + } + if (ruleDao.getCodeBodyType().equals(codeBodyType.DEPTCODE.toString())){ + return StringUtils.leftPad(String.valueOf(ruleDao.getDeptId()) ,4,"0"); + } + if (ruleDao.getCodeBodyType().equals(codeBodyType.DATETYPE.toString())){ + String df=Optional.ofNullable(ruleDao.getCodeBody()).orElse("yyyyMMdd"); + return DateUtil.format(DateUtil.date(),df); + } + return ""; + } + private String getSerial(long rid){ + DcBaseCoderuleSerialDao serialByRuleId = dcBaseCoderuleDefineService.getSerialByRuleId(rid); + if(dcBaseCoderuleDefineService.updateSerial(serialByRuleId.getRevision(),serialByRuleId.getSerialId()+1,serialByRuleId.getId())>0){ + return String.valueOf(serialByRuleId.getSerialId()+1); + }else{ + return null; + } + } + +// public String getAssetCode(DcBaseCoderuleDefineDao ruleDao){ +// if(StringUtils.isNull(ruleDao)){ +// return null; +// }else{ +// +// String serial=getSerial(ruleDao.getId()); +// if(StringUtils.isNull(serial)){ +// return null; +// } +// int serialLen=ruleDao.getCodeSerialLength().intValue(); +// StringBuilder codeBuffer=new StringBuilder(); +// // +// String spitChar= Optional.ofNullable(ruleDao.getCodeSplitFlag()).orElse(""); +// 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/DcBaseCoderuleDefineService.java b/lzbi-module/src/main/java/com/lzbi/code/service/DcBaseCoderuleDefineService.java new file mode 100644 index 0000000..d78d7af --- /dev/null +++ b/lzbi-module/src/main/java/com/lzbi/code/service/DcBaseCoderuleDefineService.java @@ -0,0 +1,109 @@ +package com.lzbi.code.service; + +import java.util.List; +import java.util.Optional; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.StrUtil; +import com.lzbi.code.domain.DcBaseCoderuleSerialDao; +import com.lzbi.code.domain.DcBusiCoderuleConfigDao; +import com.lzbi.code.domain.codeBodyType; +import com.lzbi.common.utils.DateUtils; +import com.lzbi.common.utils.StringUtils; +import org.springframework.stereotype.Service; +import com.lzbi.code.domain.DcBaseCoderuleDefineDao; +import com.lzbi.code.mapper.DcBaseCoderuleDefineMapper; +import com.baomidou.mybatisplus.extension.service.IService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +/** + * 编码规则定义Service业务层处理 + * + * @author win + * @date 2023-11-29 + */ +@Service +public class DcBaseCoderuleDefineService extends ServiceImpl implements IService +{ + + /** + * 查询编码规则定义 + * + * @param id 编码规则定义主键 + * @return 编码规则定义 + */ + public DcBaseCoderuleDefineDao selectDcBaseCoderuleDefineDaoById(Long id) + { + return baseMapper.selectDcBaseCoderuleDefineDaoById(id); + } + + /** + * 查询编码规则定义列表 + * + * @param dcBaseCoderuleDefineDao 编码规则定义 + * @return 编码规则定义 + */ + public List selectDcBaseCoderuleDefineDaoList(DcBaseCoderuleDefineDao dcBaseCoderuleDefineDao) + { + return baseMapper.selectDcBaseCoderuleDefineDaoList(dcBaseCoderuleDefineDao); + } + + /** + * 新增编码规则定义 + * + * @param dcBaseCoderuleDefineDao 编码规则定义 + * @return 结果 + */ + + public int insertDcBaseCoderuleDefineDao(DcBaseCoderuleDefineDao dcBaseCoderuleDefineDao) + { + dcBaseCoderuleDefineDao.setCreatedTime(DateUtils.getNowDate()); + return baseMapper.insertDcBaseCoderuleDefineDao(dcBaseCoderuleDefineDao); + } + + /** + * 修改编码规则定义 + * + * @param dcBaseCoderuleDefineDao 编码规则定义 + * @return 结果 + */ + + public int updateDcBaseCoderuleDefineDao(DcBaseCoderuleDefineDao dcBaseCoderuleDefineDao) + { + dcBaseCoderuleDefineDao.setUpdatedTime(DateUtils.getNowDate()); + return baseMapper.updateDcBaseCoderuleDefineDao(dcBaseCoderuleDefineDao); + } + + /** + * 批量删除编码规则定义 + * + * @param ids 需要删除的编码规则定义主键 + * @return 结果 + */ + + public int deleteDcBaseCoderuleDefineDaoByIds(Long[] ids) + { + return baseMapper.deleteDcBaseCoderuleDefineDaoByIds(ids); + } + + /** + * 删除编码规则定义信息 + * + * @param id 编码规则定义主键 + * @return 结果 + */ + + public int deleteDcBaseCoderuleDefineDaoById(Long id) + { + return baseMapper.deleteDcBaseCoderuleDefineDaoById(id); + } + public DcBaseCoderuleSerialDao getSerialByRuleId(Long rid){ + return baseMapper.getSerialByRuleId(rid); + } + public int updateSerial(long revision ,long serial,long id){ + return baseMapper.updateSerial(revision ,serial,id); + } + public DcBusiCoderuleConfigDao getRuleIdByBusicode(String busiCode){ + return baseMapper.getRuleIdByBusicode(busiCode); + } + +} diff --git a/lzbi-module/src/main/java/com/lzbi/draft/controller/DcBusiParamBillMasterController.java b/lzbi-module/src/main/java/com/lzbi/draft/controller/DcBusiParamBillMasterController.java index 931a971..dbcc05f 100644 --- a/lzbi-module/src/main/java/com/lzbi/draft/controller/DcBusiParamBillMasterController.java +++ b/lzbi-module/src/main/java/com/lzbi/draft/controller/DcBusiParamBillMasterController.java @@ -28,7 +28,7 @@ import com.lzbi.common.core.page.TableDataInfo; * @date 2023-11-28 */ @RestController -@RequestMapping("/asset/paramData") +@RequestMapping("/asset/data/paramData") public class DcBusiParamBillMasterController extends BaseController { @Autowired diff --git a/lzbi-module/src/main/java/com/lzbi/module/base/BaseModuleEntity.java b/lzbi-module/src/main/java/com/lzbi/module/base/BaseModuleEntity.java index e1f139a..cfee29c 100644 --- a/lzbi-module/src/main/java/com/lzbi/module/base/BaseModuleEntity.java +++ b/lzbi-module/src/main/java/com/lzbi/module/base/BaseModuleEntity.java @@ -1,10 +1,7 @@ package com.lzbi.module.base; import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.Accessors; + import java.io.Serializable; import java.util.Date; diff --git a/lzbi-module/src/main/java/com/lzbi/serial/controller/CodeRuleDefineController.java b/lzbi-module/src/main/java/com/lzbi/serial/controller/CodeRuleDefineController.java deleted file mode 100644 index cd2e9a6..0000000 --- a/lzbi-module/src/main/java/com/lzbi/serial/controller/CodeRuleDefineController.java +++ /dev/null @@ -1,102 +0,0 @@ -package com.lzbi.serial.controller; - - -import javax.servlet.http.HttpServletResponse; - - -import com.lzbi.common.core.controller.BaseController; -import com.lzbi.common.core.domain.AjaxResult; -import com.lzbi.common.core.page.TableDataInfo; -import com.lzbi.common.utils.poi.ExcelUtil; -import com.lzbi.serial.domain.CodeRuleDefine; -import com.lzbi.serial.service.CodeRuleDefineService; -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 java.util.List; - - -/** - * 单据编号定定义Controller - * - * @author ruoyi - * @date 2022-12-20 - */ -@RestController -@RequestMapping("/codeRule/define") -public class CodeRuleDefineController extends BaseController -{ - @Autowired - private CodeRuleDefineService codeRuleDefineService; - - /** - * 查询单据编号定定义列表 - */ - - @GetMapping("/list") - public TableDataInfo list(CodeRuleDefine sysBillnoDefine) - { - startPage(); - List list = codeRuleDefineService.selectCodeRuleDefineList(sysBillnoDefine); - return getDataTable(list); - } - - /** - * 导出单据编号定定义列表 - */ - - @PostMapping("/export") - public void export(HttpServletResponse response, CodeRuleDefine sysBillnoDefine) - { - List list = codeRuleDefineService.selectCodeRuleDefineList(sysBillnoDefine); - ExcelUtil util = new ExcelUtil(CodeRuleDefine.class); - util.exportExcel(response, list, "单据编号定定义数据"); - } - - /** - * 获取单据编号定定义详细信息 - */ - - @GetMapping(value = "/{defineId}") - public AjaxResult getInfo(@PathVariable("defineId") Long defineId) - { - return success(codeRuleDefineService.selectCodeRuleDefineByDefineId(defineId)); - } - - /** - * 新增单据编号定定义 - */ - - @PostMapping - public AjaxResult add(@RequestBody CodeRuleDefine sysBillnoDefine) - { - return toAjax(codeRuleDefineService.insertCodeRuleDefine(sysBillnoDefine)); - } - - /** - * 修改单据编号定定义 - */ - - @PutMapping - public AjaxResult edit(@RequestBody CodeRuleDefine sysBillnoDefine) - { - return toAjax(codeRuleDefineService.updateCodeRuleDefine(sysBillnoDefine)); - } - - /** - * 删除单据编号定定义 - */ - - @DeleteMapping("/{defineIds}") - public AjaxResult remove(@PathVariable Long[] defineIds) - { - return toAjax(codeRuleDefineService.deleteCodeRuleDefineByDefineIds(defineIds)); - } -} diff --git a/lzbi-module/src/main/java/com/lzbi/serial/controller/CodeRuleSerialController.java b/lzbi-module/src/main/java/com/lzbi/serial/controller/CodeRuleSerialController.java deleted file mode 100644 index d9752e7..0000000 --- a/lzbi-module/src/main/java/com/lzbi/serial/controller/CodeRuleSerialController.java +++ /dev/null @@ -1,138 +0,0 @@ -package com.lzbi.serial.controller; - - -import com.lzbi.common.core.controller.BaseController; -import com.lzbi.common.core.domain.AjaxResult; -import com.lzbi.common.core.domain.entity.SysUser; -import com.lzbi.common.core.domain.model.LoginUser; -import com.lzbi.common.core.page.TableDataInfo; -import com.lzbi.common.utils.DateUtils; -import com.lzbi.common.utils.SecurityUtils; -import com.lzbi.common.utils.StringUtils; -import com.lzbi.serial.domain.CodeRuleDefine; -import com.lzbi.serial.domain.CodeRuleSerial; -import com.lzbi.serial.service.CodeRuleDefineService; -import com.lzbi.serial.service.CodeRuleSerialService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * 单据流水号Controller - * - * @author ruoyi - * @date 2022-12-20 - */ -@RestController -@RequestMapping("/codeRule/serial") -public class CodeRuleSerialController extends BaseController { - @Autowired - private CodeRuleSerialService codeRuleSerialService; - @Autowired - private CodeRuleDefineService codeRuleDefineService; - /** - * 查询单据流水号列表 - */ - @GetMapping("/list") - public TableDataInfo list(CodeRuleSerial codeRuleSerial) { - startPage(); - List list = codeRuleSerialService.selectCodeRuleSerialList(codeRuleSerial); - return getDataTable(list); - } - - - - /** - * 获取单据流水号详细信息 - */ - - @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) { - return success(codeRuleSerialService.selectCodeRuleSerialById(id)); - } - - /** - * 新增单据流水号 - */ - - @PostMapping - public AjaxResult add(@RequestBody CodeRuleSerial codeRuleSerial) { - return toAjax(codeRuleSerialService.insertCodeRuleSerial(codeRuleSerial)); - } - - /** - * 修改单据流水号 - */ - - @PutMapping - public AjaxResult edit(@RequestBody CodeRuleSerial codeRuleSerial) { - return toAjax(codeRuleSerialService.updateCodeRuleSerial(codeRuleSerial)); - } - - /** - * 删除单据流水号 - */ - - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) { - return toAjax(codeRuleSerialService.deleteCodeRuleSerialByIds(ids)); - } - - /** - * addby zhousq 获取单据流水号 - * 根据单据的ID获取单据header - * 通过headerYYYYMMDD 获取当日流水号 查询无记录需要新增一条，有记录需要先进行更新流水号成功后返回，否则失败 - * 2023-1-16 增加动态配置能力，可以在数据库配置 格式、长度 - * 原有方法作废 - */ - - @GetMapping("/getBillNo/{node}") - public AjaxResult getBillNo(@PathVariable String node) { - String billNo = ""; - long serialsize = 4; - // - CodeRuleDefine codeRuleDefine = codeRuleDefineService.selectCodeRuleDefineByDefineId(0L); - if (codeRuleDefine.getDefHeader().isEmpty()) { - return AjaxResult.error("没有定义过ID为" + String.valueOf(0) + "的编号规则类型！"); - } - billNo = codeRuleDefine.getDefHeader() + DateUtils.dateTimeNow(codeRuleDefine.getDefHeaderType()); - serialsize=codeRuleDefine.getSerialLength(); - CodeRuleSerial codeRuleSerial = codeRuleSerialService.selectCodeRuleSerialByHeader(billNo); - SysUser sysUser = SecurityUtils.getLoginUser().getUser(); - if (null== codeRuleSerial || null == codeRuleSerial.getHeaderBillno()) { - codeRuleSerial=new CodeRuleSerial(); - codeRuleSerial.setHeaderBillno(billNo); - codeRuleSerial.setLockSerial(1L); - codeRuleSerial.setSerialNo(1L); - codeRuleSerial.setCreatedTime(DateUtils.getNowDate()); - codeRuleSerial.setCreatedBy(sysUser.getUserName()); - codeRuleSerial.setUpdatedBy(sysUser.getUserName()); - codeRuleSerial.setUpdatedTime(DateUtils.getNowDate()); - int ret = codeRuleSerialService.insertCodeRuleSerial(codeRuleSerial); - if (ret > 0) { - return AjaxResult.success("获取规则编号成功",billNo + StringUtils.padl(1L, (int)serialsize)); - } else { - return AjaxResult.error("新建规则编号失败！"); - } - - } else { - long serialnum = codeRuleSerial.getSerialNo(); - codeRuleSerial.setSerialNo(serialnum + 1L); - codeRuleSerial.setLockSerial(serialnum); - codeRuleSerial.setUpdatedBy(sysUser.getUserName()); - codeRuleSerial.setUpdatedTime(DateUtils.getNowDate()); - int ret = codeRuleSerialService.updateCodeRuleSerialLock(codeRuleSerial); - if (ret > 0) { - - return AjaxResult.success("ok",billNo + StringUtils.padl(codeRuleSerial.getSerialNo(), (int)serialsize)); - } else { - return AjaxResult.error("新建规则编号失败！请稍后重试"); - } - - } - - } - - -} diff --git a/lzbi-module/src/main/java/com/lzbi/serial/domain/CodeRuleDefine.java b/lzbi-module/src/main/java/com/lzbi/serial/domain/CodeRuleDefine.java deleted file mode 100644 index 0784e3e..0000000 --- a/lzbi-module/src/main/java/com/lzbi/serial/domain/CodeRuleDefine.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.lzbi.serial.domain; - -import com.lzbi.module.base.BaseModuleEntity; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - - -/** - * 单据编号定定义对象 sys_billno_define - * - * @author ruoyi - * @date 2022-12-20 - */ -@Data -@ApiModel("编码规则定义") -public class CodeRuleDefine extends BaseModuleEntity -{ - private static final long serialVersionUID = 1L; - @ApiModelProperty("编码规则ID") - /** 定义ID唯一 */ - private Long defineId; - - /** 单据开头名称 */ - @ApiModelProperty("编码规则头") - private String defHeader; - /** 单据类型 */ - @ApiModelProperty("编码规则类型") - private String defClass; - /** 所属部门id */ - @ApiModelProperty("编码规则头") - private Long deptId; - @ApiModelProperty("编码规则头") - private String defHeaderType; - @ApiModelProperty("编码规则头") - private Long serialLength; - - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("defineId", getDefineId()) - .append("defHeader", getDefHeader()) - .append("defClass", getDefClass()) - .append("deptId", getDeptId()) - .append("defHeaderType", getDefHeaderType()) - .append("serialLength", getSerialLength()) - .toString(); - } -} diff --git a/lzbi-module/src/main/java/com/lzbi/serial/domain/CodeRuleSerial.java b/lzbi-module/src/main/java/com/lzbi/serial/domain/CodeRuleSerial.java deleted file mode 100644 index 4701091..0000000 --- a/lzbi-module/src/main/java/com/lzbi/serial/domain/CodeRuleSerial.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.lzbi.serial.domain; - -import com.lzbi.module.base.BaseModuleEntity; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - - -/** - * 单据流水号对象 sys_billno_serial - * - * @author ruoyi - * @date 2022-12-20 - */ -@Data -@ApiModel("") -public class CodeRuleSerial extends BaseModuleEntity -{ - private static final long serialVersionUID = 1L; - - /** 唯一标识符 */ - private Long id; - - /** 单据开头名称+YYYYMMDD */ - @ApiModelProperty("单据开头名称") - private String headerBillno; - - /** 版本锁 */ - @ApiModelProperty("版本锁") - private Long lockSerial; - - /** 流水号 */ - @ApiModelProperty("流水号") - private Long serialNo; - - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("headerBillno", getHeaderBillno()) - .append("lockSerial", getLockSerial()) - .append("serialNo", getSerialNo()) - .toString(); - } -} diff --git a/lzbi-module/src/main/java/com/lzbi/serial/mapper/CodeRuleDefineMapper.java b/lzbi-module/src/main/java/com/lzbi/serial/mapper/CodeRuleDefineMapper.java deleted file mode 100644 index c6e1b3d..0000000 --- a/lzbi-module/src/main/java/com/lzbi/serial/mapper/CodeRuleDefineMapper.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.lzbi.serial.mapper; - -import com.baomidou.mybatisplus.annotation.InterceptorIgnore; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.lzbi.bi.domain.DcBusiDataScreenDto; -import com.lzbi.serial.domain.CodeRuleDefine; - -import java.util.List; - -/** - * 单据编号定定义Mapper接口 - * - * @author ruoyi - * @date 2022-12-20 - */ -@InterceptorIgnore(tenantLine = "true") -public interface CodeRuleDefineMapper extends BaseMapper -{ - /** - * 查询单据编号定定义 - * - * @param defineId 单据编号定定义主键 - * @return 单据编号定定义 - */ - public CodeRuleDefine selectCodeRuleDefineByDefineId(Long defineId); - - /** - * 查询单据编号定定义列表 - * - * @param - * @return 单据编号定定义集合 - */ - public List selectCodeRuleDefineList(CodeRuleDefine codeRuleDefine); - - /** - * 新增单据编号定定义 - * - * @param - * @return 结果 - */ - public int insertCodeRuleDefine(CodeRuleDefine codeRuleDefine); - - /** - * 修改单据编号定定义 - * - * @param - * @return 结果 - */ - public int updateCodeRuleDefine(CodeRuleDefine codeRuleDefine); - - /** - * 删除单据编号定定义 - * - * @param defineId 单据编号定定义主键 - * @return 结果 - */ - public int deleteCodeRuleDefineByDefineId(Long defineId); - - /** - * 批量删除单据编号定定义 - * - * @param defineIds 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteCodeRuleDefineByDefineIds(Long[] defineIds); -} diff --git a/lzbi-module/src/main/java/com/lzbi/serial/mapper/CodeRuleSerialMapper.java b/lzbi-module/src/main/java/com/lzbi/serial/mapper/CodeRuleSerialMapper.java deleted file mode 100644 index 586a36d..0000000 --- a/lzbi-module/src/main/java/com/lzbi/serial/mapper/CodeRuleSerialMapper.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.lzbi.serial.mapper; - -import com.baomidou.mybatisplus.annotation.InterceptorIgnore; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.lzbi.serial.domain.CodeRuleDefine; -import com.lzbi.serial.domain.CodeRuleSerial; - -import java.util.List; - -/** - * 单据流水号Mapper接口 - * - * @author ruoyi - * @date 2022-12-20 - */ -@InterceptorIgnore(tenantLine = "true") -public interface CodeRuleSerialMapper extends BaseMapper -{ - /** - * 查询单据流水号 - * - * @param id 单据流水号主键 - * @return 单据流水号 - */ - public CodeRuleSerial selectCodeRuleSerialById(Long id); - - /** - * 查询单据流水号列表 - * - * @param - * @return 单据流水号集合 - */ - public List selectCodeRuleSerialList(CodeRuleSerial codeRuleSerial); - - /** - * 新增单据流水号 - * - * @param - * @return 结果 - */ - public int insertCodeRuleSerial(CodeRuleSerial codeRuleSerial); - - /** - * 修改单据流水号 - * - * @param - * @return 结果 - */ - public int updateCodeRuleSerial(CodeRuleSerial codeRuleSerial); - - /** - * 删除单据流水号 - * - * @param id 单据流水号主键 - * @return 结果 - */ - public int deleteCodeRuleSerialById(Long id); - - /** - * 批量删除单据流水号 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteCodeRuleSerialByIds(Long[] ids); - - - public CodeRuleSerial selectCodeRuleSerialByHeader(String headerBillno); - /** - * 成功获取完成流水号获取为1，失败为0 - * - * @param svo 必须包含参数 header 单据头 serialno - * @return 单据流水号 - */ - - public int updateCodeRuleSerialLock(CodeRuleSerial svo); -} diff --git a/lzbi-module/src/main/java/com/lzbi/serial/service/CodeRuleDefineService.java b/lzbi-module/src/main/java/com/lzbi/serial/service/CodeRuleDefineService.java deleted file mode 100644 index a4eb603..0000000 --- a/lzbi-module/src/main/java/com/lzbi/serial/service/CodeRuleDefineService.java +++ /dev/null @@ -1,105 +0,0 @@ -package com.lzbi.serial.service; - - -import com.baomidou.mybatisplus.annotation.InterceptorIgnore; -import com.baomidou.mybatisplus.extension.service.IService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.lzbi.common.core.domain.model.LoginUser; -import com.lzbi.common.utils.DateUtils; -import com.lzbi.common.utils.SecurityUtils; -import com.lzbi.serial.domain.CodeRuleDefine; -import com.lzbi.serial.mapper.CodeRuleDefineMapper; - -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 单据编号定定义Service业务层处理 - * - * @author ruoyi - * @date 2022-12-20 - */ - -@Service -public class CodeRuleDefineService extends ServiceImpl implements IService -{ - - - /** - * 查询单据编号定定义 - * - * @param defineId 单据编号定定义主键 - * @return 单据编号定定义 - */ - - public CodeRuleDefine selectCodeRuleDefineByDefineId(Long defineId) - { - return baseMapper.selectCodeRuleDefineByDefineId(defineId); - } - - /** - * 查询单据编号定定义列表 - * - * @param codeRuleDefine 单据编号定定义 - * @return 单据编号定定义 - */ - - public List selectCodeRuleDefineList(CodeRuleDefine codeRuleDefine) - { - return baseMapper.selectCodeRuleDefineList(codeRuleDefine); - } - - /** - * 新增单据编号定定义 - * - * @param codeRuleDefine 单据编号定定义 - * @return 结果 - */ - - public int insertCodeRuleDefine(CodeRuleDefine codeRuleDefine) - { - LoginUser loginUser= SecurityUtils.getLoginUser(); - codeRuleDefine.setCreatedBy(loginUser.getUsername()); - codeRuleDefine.setCreatedTime(DateUtils.getNowDate()); - codeRuleDefine.setDeptId(loginUser.getDeptId()); - return baseMapper.insertCodeRuleDefine(codeRuleDefine); - } - - /** - * 修改单据编号定定义 - * - * @param codeRuleDefine 单据编号定定义 - * @return 结果 - */ - - public int updateCodeRuleDefine(CodeRuleDefine codeRuleDefine) - { - codeRuleDefine.setUpdatedTime(DateUtils.getNowDate()); - return baseMapper.updateCodeRuleDefine(codeRuleDefine); - } - - /** - * 批量删除单据编号定定义 - * - * @param defineIds 需要删除的单据编号定定义主键 - * @return 结果 - */ - - public int deleteCodeRuleDefineByDefineIds(Long[] defineIds) - { - return baseMapper.deleteCodeRuleDefineByDefineIds(defineIds); - } - - /** - * 删除单据编号定定义信息 - * - * @param defineId 单据编号定定义主键 - * @return 结果 - */ - - public int deleteCodeRuleDefineByDefineId(Long defineId) - { - return baseMapper.deleteCodeRuleDefineByDefineId(defineId); - } -} diff --git a/lzbi-module/src/main/java/com/lzbi/serial/service/CodeRuleSerialService.java b/lzbi-module/src/main/java/com/lzbi/serial/service/CodeRuleSerialService.java deleted file mode 100644 index 7c2f910..0000000 --- a/lzbi-module/src/main/java/com/lzbi/serial/service/CodeRuleSerialService.java +++ /dev/null @@ -1,112 +0,0 @@ -package com.lzbi.serial.service; - - -import com.baomidou.mybatisplus.extension.service.IService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.lzbi.common.utils.DateUtils; -import com.lzbi.serial.domain.CodeRuleSerial; -import com.lzbi.serial.mapper.CodeRuleSerialMapper; - - -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 单据流水号Service业务层处理 - * - * @author ruoyi - * @date 2022-12-20 - */ -@Service -public class CodeRuleSerialService extends ServiceImpl implements IService -{ - - /** - * 查询单据流水号 - * - * @param id 单据流水号主键 - * @return 单据流水号 - */ - - public CodeRuleSerial selectCodeRuleSerialById(Long id) - { - return baseMapper.selectCodeRuleSerialById(id); - } - - public CodeRuleSerial selectCodeRuleSerialByHeader(String header){ - return baseMapper.selectCodeRuleSerialByHeader(header); - } - /** - * 成功获取完成流水号获取为1，失败为0 - * - * @param svo 必须包含参数 header 单据头 serialno - * @return 单据流水号 - */ - - public int updateCodeRuleSerialLock(CodeRuleSerial svo){ - return baseMapper.updateCodeRuleSerialLock(svo); - } - - /** - * 查询单据流水号列表 - * - * @param sysBillnoSerial 单据流水号 - * @return 单据流水号 - */ - - public List selectCodeRuleSerialList(CodeRuleSerial sysBillnoSerial) - { - return baseMapper.selectCodeRuleSerialList(sysBillnoSerial); - } - - /** - * 新增单据流水号 - * - * @param - * @return 结果 - */ - - public int insertCodeRuleSerial(CodeRuleSerial codeRuleSerial) - { - codeRuleSerial.setCreatedTime(DateUtils.getNowDate()); - return baseMapper.insertCodeRuleSerial(codeRuleSerial); - } - - /** - * 修改单据流水号 - * - * @param - * @return 结果 - */ - - public int updateCodeRuleSerial(CodeRuleSerial codeRuleSerial) - { - codeRuleSerial.setUpdatedTime(DateUtils.getNowDate()); - return baseMapper.updateCodeRuleSerial(codeRuleSerial); - } - - /** - * 批量删除单据流水号 - * - * @param ids 需要删除的单据流水号主键 - * @return 结果 - */ - - public int deleteCodeRuleSerialByIds(Long[] ids) - { - return baseMapper.deleteCodeRuleSerialByIds(ids); - } - - /** - * 删除单据流水号信息 - * - * @param id 单据流水号主键 - * @return 结果 - */ - - public int deleteCodeRuleSerialById(Long id) - { - return baseMapper.deleteCodeRuleSerialById(id); - } -} diff --git a/lzbi-module/src/main/java/com/lzbi/task/domain/EumValueReadType.java b/lzbi-module/src/main/java/com/lzbi/task/domain/EumValueReadType.java new file mode 100644 index 0000000..44f19b8 --- /dev/null +++ b/lzbi-module/src/main/java/com/lzbi/task/domain/EumValueReadType.java @@ -0,0 +1,44 @@ +package com.lzbi.task.domain; + +/** + * 业务操作类型 + * + * @author ruoyi + */ +public enum EumValueReadType +{ + /** + * 和值 + */ + SUM("sum"), + + /** + * 均值, + */ + AVG("avg"), + + /** + *除零平均, + */ + AVGNOZERO("avgz"), + + /** + * 开始时间点值 + */ + PVBEGIN("pvbegin"), + /** + * 结束时间点值 + */ + PVEND("pvend"), + ; + private final String type; + EumValueReadType(String type){ + this.type=type; + } + @Override + public String toString(){ + return this.type; + } + + +} diff --git a/lzbi-module/src/main/java/com/lzbi/task/domain/ReadQueryParams.java b/lzbi-module/src/main/java/com/lzbi/task/domain/ReadQueryParams.java new file mode 100644 index 0000000..d20d043 --- /dev/null +++ b/lzbi-module/src/main/java/com/lzbi/task/domain/ReadQueryParams.java @@ -0,0 +1,18 @@ +package com.lzbi.task.domain; + +import lombok.Data; + +import java.util.List; + +/** + * @auth create by Administrator + * @date 2023/11/30 + * ReadQueryParams + */ +@Data +public class ReadQueryParams { + private String beginTime; + private String endTime; + private List deviceCodes; + private List paramCodes; +} diff --git a/lzbi-module/src/main/java/com/lzbi/task/domain/WorkParamInfo.java b/lzbi-module/src/main/java/com/lzbi/task/domain/WorkParamInfo.java new file mode 100644 index 0000000..fe85d56 --- /dev/null +++ b/lzbi-module/src/main/java/com/lzbi/task/domain/WorkParamInfo.java @@ -0,0 +1,39 @@ +package com.lzbi.task.domain; + +import lombok.Data; + +/** + * @auth create by Administrator + * @date 2023/11/30 + * WorkParamInfo + * 生产数据中设备参数的值 + */ +@Data +public class WorkParamInfo { + /**设备编号*/ + private String deviceCode; + /**参数编码*/ + private String paramCode; + /**统计单元 + * */ + private String assetUnitCode; + /** + * 统计单元参数编码 + * */ + private String assetUnitParamCode; + /** + * 读取日期 日期yyyy-MM-dd + * */ + private String readDate; + /**读取时段 + * */ + private Integer readPoint; + /** + * 值类型 开始时间点值、全平均、结束时间点值、除零平均 + * */ + private String valueType; + /**数值内容 + * */ + private Double value; + +} diff --git a/lzbi-module/src/main/java/com/lzbi/task/domain/WorkReadVo.java b/lzbi-module/src/main/java/com/lzbi/task/domain/WorkReadVo.java new file mode 100644 index 0000000..2a3dc16 --- /dev/null +++ b/lzbi-module/src/main/java/com/lzbi/task/domain/WorkReadVo.java @@ -0,0 +1,143 @@ +package com.lzbi.task.domain; + +import cn.hutool.core.date.DatePattern; +import cn.hutool.core.date.DateUtil; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.NonNull; + +import java.util.Date; +import java.util.Optional; + +/** + * @auth create by Administrator + * @date 2023/11/30 + * WorkReadVo + * 从生产数据库读取的参数统计值 + */ + +public class WorkReadVo { + /***/ + @ApiModelProperty("参数编码") + private String paramCode; + @ApiModelProperty("设备编码") + private String deviceCode; + @ApiModelProperty("统计时间") + private Date thour; + @ApiModelProperty("和值") + private Double total; + @ApiModelProperty("总数") + private Double countsall; + @ApiModelProperty("除零总数") + private Double countsz; + @ApiModelProperty("最大值") + private Double maxVal; + @ApiModelProperty("最小值") + private Double minVal; + @ApiModelProperty("首值") + private Double firstVal; + @ApiModelProperty("末值") + private Double lastVal; + @ApiModelProperty("均值") + private Double avgAll; + @ApiModelProperty("不计算0值的均值") + private Double avgNoZero; + @ApiModelProperty("日期-天") + private String dateCount; + @ApiModelProperty("时间-小时") + private Integer hourCount; + public String getParamCode() { + return paramCode; + } + + public void setParamCode(String paramCode) { + this.paramCode = paramCode; + } + + public String getDeviceCode() { + return deviceCode; + } + + public void setDeviceCode(String deviceCode) { + this.deviceCode = deviceCode; + } + + public Date getThour() { + return thour; + } + + public void setThour(Date thour) { + this.thour = thour; + } + + public Double getTotal() { + return total; + } + + public void setTotal(Double total) { + this.total = Optional.ofNullable(total).orElse(0.00); + } + + public Double getCountsall() { + return countsall; + } + + public void setCountsall(Double countsall) { + this.countsall = Optional.ofNullable(countsall).orElse(1.00); + } + + public Double getCountsz() { + return countsz; + } + + public void setCountsz(Double countsz) { + this.countsz = Optional.ofNullable(countsz).orElse(1.00); + } + + public Double getMaxVal() { + return maxVal; + } + + public void setMaxVal(Double maxVal) { + this.maxVal =Optional.ofNullable(maxVal).orElse(0.00); + } + + public Double getMinVal() { + return minVal; + } + + public void setMinVal(Double minVal) { + this.minVal =Optional.ofNullable(minVal).orElse(0.00); + } + + public Double getFirstVal() { + return firstVal; + } + + public void setFirstVal(Double firstVal) { + this.firstVal = Optional.ofNullable(firstVal).orElse(0.00); + } + + public Double getLastVal() { + return lastVal; + } + + public void setLastVal(Double lastVal) { + this.lastVal = Optional.ofNullable(lastVal).orElse(0.00); + } + + public Double getAvgAll(){ + return this.total/(this.countsall>0.0?this.countsall:1); + } + public Double getAvgNoZero(){ + return this.total/(this.countsz>0.0?this.countsz:1); + } + + public String getDateCount() { + return DateUtil.format(this.thour, DatePattern.NORM_DATE_PATTERN); + } + + public Integer getHourCount() { + return DateUtil.hour(this.thour, true); + } +} diff --git a/lzbi-module/src/main/java/com/lzbi/task/mapper/WorkParamReadMapper.java b/lzbi-module/src/main/java/com/lzbi/task/mapper/WorkParamReadMapper.java new file mode 100644 index 0000000..ab15bf8 --- /dev/null +++ b/lzbi-module/src/main/java/com/lzbi/task/mapper/WorkParamReadMapper.java @@ -0,0 +1,23 @@ +package com.lzbi.task.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.lzbi.code.domain.DcBaseCoderuleDefineDao; +import com.lzbi.code.domain.DcBaseCoderuleSerialDao; +import com.lzbi.code.domain.DcBusiCoderuleConfigDao; +import com.lzbi.task.domain.ReadQueryParams; +import com.lzbi.task.domain.WorkParamInfo; +import com.lzbi.task.domain.WorkReadVo; + +import java.util.List; + +/** + * 编码规则定义Mapper接口 + * + * @author win + * @date 2023-11-29 + */ + +public interface WorkParamReadMapper extends BaseMapper +{ + public List readWorkValue(ReadQueryParams readQueryParams); +} diff --git a/lzbi-module/src/main/java/com/lzbi/task/service/WorkParamReadService.java b/lzbi-module/src/main/java/com/lzbi/task/service/WorkParamReadService.java new file mode 100644 index 0000000..31f4665 --- /dev/null +++ b/lzbi-module/src/main/java/com/lzbi/task/service/WorkParamReadService.java @@ -0,0 +1,40 @@ +package com.lzbi.task.service; + +import cn.hutool.core.date.DateUtil; +import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.mybatisplus.extension.service.IService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.lzbi.asset.service.DcBusiWorkReadConfigService; +import com.lzbi.code.domain.DcBaseCoderuleDefineDao; +import com.lzbi.code.domain.DcBaseCoderuleSerialDao; +import com.lzbi.code.domain.DcBusiCoderuleConfigDao; +import com.lzbi.code.domain.codeBodyType; +import com.lzbi.common.utils.DateUtils; +import com.lzbi.common.utils.StringUtils; +import com.lzbi.task.domain.ReadQueryParams; +import com.lzbi.task.domain.WorkParamInfo; +import com.lzbi.task.domain.WorkReadVo; +import com.lzbi.task.mapper.WorkParamReadMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Optional; + +/** + * 编码规则定义Service业务层处理 + * + * @author win + * @date 2023-11-29 + */ +@DS("workDB") +@Service +public class WorkParamReadService extends ServiceImpl implements IService + +{ + /*获取生产单元的参数读取配置 + * */ + public List readWorkValue(ReadQueryParams readQueryParams){ + return baseMapper.readWorkValue(readQueryParams); + } +} diff --git a/lzbi-module/src/main/resources/mapper/asset/DcBaseCoderuleDefineMapper.xml b/lzbi-module/src/main/resources/mapper/asset/DcBaseCoderuleDefineMapper.xml new file mode 100644 index 0000000..90c2314 --- /dev/null +++ b/lzbi-module/src/main/resources/mapper/asset/DcBaseCoderuleDefineMapper.xml @@ -0,0 +1,205 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select tenant_id, revision, created_by, created_time, updated_by, updated_time, delete_by, delete_time, id, code_config_name, code_header, code_body, code_body_type, code_serial_length, code_split_flag from dc_base_coderule_define + + + + + + + + insert into dc_base_coderule_define + + tenant_id, + revision, + created_by, + created_time, + updated_by, + updated_time, + delete_by, + delete_time, + code_config_name, + code_header, + code_body, + code_body_type, + code_serial_length, + code_split_flag, + + + #{tenantId}, + #{revision}, + #{createdBy}, + #{createdTime}, + #{updatedBy}, + #{updatedTime}, + #{deleteBy}, + #{deleteTime}, + #{codeConfigName}, + #{codeHeader}, + #{codeBody}, + #{codeBodyType}, + #{codeSerialLength}, + #{codeSplitFlag}, + + + + + update dc_base_coderule_define + + tenant_id = #{tenantId}, + revision = #{revision}, + created_by = #{createdBy}, + created_time = #{createdTime}, + updated_by = #{updatedBy}, + updated_time = #{updatedTime}, + delete_by = #{deleteBy}, + delete_time = #{deleteTime}, + code_config_name = #{codeConfigName}, + code_header = #{codeHeader}, + code_body = #{codeBody}, + code_body_type = #{codeBodyType}, + code_serial_length = #{codeSerialLength}, + code_split_flag = #{codeSplitFlag}, + + where id = #{id} + + + + delete from dc_base_coderule_define where id = #{id} + + + + delete from dc_base_coderule_define where id in + + #{id} + + + + + + + update dc_base_coderule_serial + set revision=#{param2} , serial_id=#{param2} + where revision=#{param1} and id=#{param3} + + + + \ No newline at end of file diff --git a/lzbi-module/src/main/resources/mapper/asset/DcBusiWorkReadConfigMapper.xml b/lzbi-module/src/main/resources/mapper/asset/DcBusiWorkReadConfigMapper.xml new file mode 100644 index 0000000..72b1045 --- /dev/null +++ b/lzbi-module/src/main/resources/mapper/asset/DcBusiWorkReadConfigMapper.xml @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select + tenant_id, + revision, + created_by, + created_time, + updated_by, + updated_time, + delete_by, + delete_time, + id, + asset_code, + asset_param_code, + goal_param_code, + goal_param_ext1, + goal_param_ext2, + goal_param_type, + goal_source, + from dc_busi_work_read_config + + + + insert into dc_busi_work_read_config + + tenant_id, + revision, + created_by, + created_time, + updated_by, + updated_time, + delete_by, + delete_time, + id, + asset_code, + asset_param_code, + goal_param_code, + goal_param_ext1, + goal_param_ext2, + goal_param_type, + goal_source, + + + #{tenantId}, + #{revision}, + #{createdBy}, + #{createdTime}, + #{updatedBy}, + #{updatedTime}, + #{deleteBy}, + #{deleteTime}, + #{id}, + #{assetCode}, + #{assetParamCode}, + #{goalParamCode}, + #{goalParamExt1}, + #{goalParamExt2}, + #{goalParamType}, + #{goalSource}, + + + + \ No newline at end of file diff --git a/lzbi-module/src/main/resources/mapper/asset/WorkParamReadMapper.xml b/lzbi-module/src/main/resources/mapper/asset/WorkParamReadMapper.xml new file mode 100644 index 0000000..752bc88 --- /dev/null +++ b/lzbi-module/src/main/resources/mapper/asset/WorkParamReadMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lzbi-module/src/main/resources/mapper/serial/CodeRuleDefineMapper.xml b/lzbi-module/src/main/resources/mapper/serial/CodeRuleDefineMapper.xml deleted file mode 100644 index 3358381..0000000 --- a/lzbi-module/src/main/resources/mapper/serial/CodeRuleDefineMapper.xml +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - - - - - - - - - - - - - - select define_id, def_header, def_class, dept_id, create_by, create_time, update_by, update_time,def_header_type,serial_length from sys_billno_define - - - - - - - - insert into sys_billno_define - - define_id, - def_header, - def_class, - dept_id, - create_by, - create_time, - update_by, - update_time, - def_header_type, - serial_length, - - - #{defineId}, - #{defHeader}, - #{defClass}, - #{deptId}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{defHeaderType}, - #{serialLength}, - - - - - update sys_billno_define - - def_header = #{defHeader}, - def_class = #{defClass}, - dept_id = #{deptId}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - def_header_type = #{defHeaderType}, - serial_length = #{serialLength}, - - where define_id = #{defineId} - - - - delete from sys_billno_define where define_id = #{defineId} - - - - delete from sys_billno_define where define_id in - - #{defineId} - - - \ No newline at end of file diff --git a/lzbi-module/src/main/resources/mapper/serial/CodeRuleSerialMapper.xml b/lzbi-module/src/main/resources/mapper/serial/CodeRuleSerialMapper.xml deleted file mode 100644 index 7129323..0000000 --- a/lzbi-module/src/main/resources/mapper/serial/CodeRuleSerialMapper.xml +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - - - - - - - - - - - - select id, header_billno, lock_serial, seselectCodeRuleSerialListrial_no, create_by, create_time, update_by, update_time from sys_billno_serial - - - - - - - - insert into sys_billno_serial - - header_billno, - lock_serial, - serial_no, - create_by, - create_time, - update_by, - update_time, - - - #{headerBillno}, - #{lockSerial}, - #{serialNo}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - - - - - update sys_billno_serial - - header_billno = #{headerBillno}, - lock_serial = #{lockSerial}, - serial_no = #{serialNo}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - - where id = #{id} - - - - delete from sys_billno_serial where id = #{id} - - - - delete from sys_billno_serial where id in - - #{id} - - - - - - update sys_billno_serial - - lock_serial= #{serialNo},serial_no = #{serialNo}, - update_by = #{updateBy}, - update_time = #{updateTime}, - - where header_billno = #{headerBillno} and lock_serial= #{lockSerial} - - - - - \ No newline at end of file