From 74cbd25a8b5e97b9dc4de4b3a9d5728b87bffbed Mon Sep 17 00:00:00 2001 From: ljlong_2630 Date: Mon, 18 Dec 2023 16:54:37 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=BB=93=E5=B1=80=E5=86=B2=E7=AA=81?= =?UTF-8?q?=EF=BC=8C=E5=B9=B6=E4=BF=AE=E6=94=B9dao=E4=BF=AE=E9=A5=B0?= =?UTF-8?q?=E7=9A=84bean=E5=8A=A0=E8=B5=84=E4=BA=A7=E6=8C=87=E6=A0=87?= =?UTF-8?q?=E5=9F=BA=E7=A1=80=E7=95=8C=E9=9D=A2=E5=BC=80=E5=8F=91=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lzbi/asset/domain/DcBaseAssetInfo.java | 1 - .../service/DcBusiPlanTargetMonthService.java | 18 +-- .../com/lzbi/common/SelectOptionsControl.java | 22 +-- .../DcBusiTargetAdjustDaySubService.java | 8 +- .../lzbi/module/base/BaseModuleEntity.java | 1 - .../DcBaseAssetTargetController.java | 93 ++++++++++-- .../DcBaseTargetModelController.java | 15 ++ ...tTargetDao.java => DcBaseAssetTarget.java} | 60 +++----- .../mapper/DcBaseAssetTargetMapper.java | 23 +-- .../service/DcBaseAssetTargetService.java | 38 ++--- .../mapper/asset/DcBaseAssetInfoMapper.xml | 137 +++++++----------- .../targetFolder/DcBaseAssetTargetMapper.xml | 55 ++++--- 12 files changed, 260 insertions(+), 211 deletions(-) rename lzbi-module/src/main/java/com/lzbi/targetFolder/domain/{DcBaseAssetTargetDao.java => DcBaseAssetTarget.java} (66%) diff --git a/lzbi-module/src/main/java/com/lzbi/asset/domain/DcBaseAssetInfo.java b/lzbi-module/src/main/java/com/lzbi/asset/domain/DcBaseAssetInfo.java index 61fb367..8276ae2 100644 --- a/lzbi-module/src/main/java/com/lzbi/asset/domain/DcBaseAssetInfo.java +++ b/lzbi-module/src/main/java/com/lzbi/asset/domain/DcBaseAssetInfo.java @@ -13,7 +13,6 @@ import lombok.experimental.Accessors; * @date 2023-11-27 */ @Data -//@TableName("dc_base_work_special") @Accessors(chain = true) public class DcBaseAssetInfo extends BaseModuleEntity { private static final long serialVersionUID = 1L; diff --git a/lzbi-module/src/main/java/com/lzbi/bill/service/DcBusiPlanTargetMonthService.java b/lzbi-module/src/main/java/com/lzbi/bill/service/DcBusiPlanTargetMonthService.java index 7b654a6..9fbb2ad 100644 --- a/lzbi-module/src/main/java/com/lzbi/bill/service/DcBusiPlanTargetMonthService.java +++ b/lzbi-module/src/main/java/com/lzbi/bill/service/DcBusiPlanTargetMonthService.java @@ -9,7 +9,7 @@ import com.lzbi.common.utils.DateUtils; import com.lzbi.special.domain.DcBaseWorkSpecial; import com.lzbi.special.mapper.DcBaseWorkSpecialMapper; import com.lzbi.system.service.impl.SysDeptServiceImpl; -import com.lzbi.targetFolder.domain.DcBaseAssetTargetDao; +import com.lzbi.targetFolder.domain.DcBaseAssetTarget; import com.lzbi.targetFolder.mapper.DcBaseAssetTargetMapper; import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -94,10 +94,10 @@ public class DcBusiPlanTargetMonthService extends ServiceImpl list = dcBaseAssetTargetService.selectDcBaseAssetTargetDaoList(dcBaseAssetTargetDao); + List list = dcBaseAssetTargetService.selectDcBaseAssetTargetList(dcBaseAssetTarget); return getDataTable(list); } @@ -53,10 +58,10 @@ public class DcBaseAssetTargetController extends BaseController @PreAuthorize("@ss.hasPermi('target:target:export')") @Log(title = "资产指标配置", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, DcBaseAssetTargetDao dcBaseAssetTargetDao) + public void export(HttpServletResponse response, DcBaseAssetTarget dcBaseAssetTarget) { - List list = dcBaseAssetTargetService.selectDcBaseAssetTargetDaoList(dcBaseAssetTargetDao); - ExcelUtil util = new ExcelUtil(DcBaseAssetTargetDao.class); + List list = dcBaseAssetTargetService.selectDcBaseAssetTargetList(dcBaseAssetTarget); + ExcelUtil util = new ExcelUtil(DcBaseAssetTarget.class); util.exportExcel(response, list, "资产指标配置数据"); } @@ -67,7 +72,7 @@ public class DcBaseAssetTargetController extends BaseController @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { - return success(dcBaseAssetTargetService.selectDcBaseAssetTargetDaoById(id)); + return success(dcBaseAssetTargetService.selectDcBaseAssetTargetById(id)); } /** @@ -76,9 +81,9 @@ public class DcBaseAssetTargetController extends BaseController @PreAuthorize("@ss.hasPermi('target:target:add')") @Log(title = "资产指标配置", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@RequestBody DcBaseAssetTargetDao dcBaseAssetTargetDao) + public AjaxResult add(@RequestBody DcBaseAssetTarget dcBaseAssetTarget) { - return toAjax(dcBaseAssetTargetService.insertDcBaseAssetTargetDao(dcBaseAssetTargetDao)); + return toAjax(dcBaseAssetTargetService.insertDcBaseAssetTarget(dcBaseAssetTarget)); } /** @@ -87,9 +92,9 @@ public class DcBaseAssetTargetController extends BaseController @PreAuthorize("@ss.hasPermi('target:target:edit')") @Log(title = "资产指标配置", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@RequestBody DcBaseAssetTargetDao dcBaseAssetTargetDao) + public AjaxResult edit(@RequestBody DcBaseAssetTarget dcBaseAssetTarget) { - return toAjax(dcBaseAssetTargetService.updateDcBaseAssetTargetDao(dcBaseAssetTargetDao)); + return toAjax(dcBaseAssetTargetService.updateDcBaseAssetTarget(dcBaseAssetTarget)); } /** @@ -100,7 +105,7 @@ public class DcBaseAssetTargetController extends BaseController @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) { - return toAjax(dcBaseAssetTargetService.deleteDcBaseAssetTargetDaoByIds(ids)); + return toAjax(dcBaseAssetTargetService.deleteDcBaseAssetTargetByIds(ids)); } @@ -109,11 +114,71 @@ public class DcBaseAssetTargetController extends BaseController */ @PreAuthorize("@ss.hasPermi('target:target:list')") @GetMapping("/listNoPage") - public AjaxResult listNoPage(DcBaseAssetTargetDao dcBaseAssetTargetDao) + public AjaxResult listNoPage(DcBaseAssetTarget dcBaseAssetTarget) { - List list = dcBaseAssetTargetService.selectDcBaseAssetTargetDaoList(dcBaseAssetTargetDao); + List list = dcBaseAssetTargetService.selectDcBaseAssetTargetList(dcBaseAssetTarget); return AjaxResult.success(list); } + /** + * 新增资产信息 + */ + @PreAuthorize("@ss.hasPermi('lzbi:assetInfo:add')") + @Log(title = "资产信息", businessType = BusinessType.INSERT) + @PostMapping("/addBatch") + public AjaxResult addBatch(@RequestBody JSONArray jsonArray) + { + if (jsonArray == null) { + throw new IllegalArgumentException("未能接收任何参数！"); + } + List beanList = new ArrayList<>(); + try { + for (int i = 0; i < jsonArray.size(); i++) { + JSONObject beanObject = jsonArray.getJSONObject(i); + // 移除ID属性 + beanObject.remove("id"); + DcBaseAssetTarget dcBaseAssetTarget = JSON.toJavaObject(beanObject, DcBaseAssetTarget.class); + dcBaseAssetTarget.setCreatedTime(DateUtils.getNowDate()); + dcBaseAssetTarget.setDeptId(getDeptId()); + dcBaseAssetTarget.setUserId(getUserId()); + dcBaseAssetTarget.setCreatedBy(String.valueOf(getUserId())); + dcBaseAssetTarget.setCreatedTime(DateUtils.getNowDate()); + beanList.add(dcBaseAssetTarget); + } + } catch (Exception e) { + throw new IllegalArgumentException("解析list对象异常！"); + } + return toAjax(dcBaseAssetTargetService.saveBatch(beanList)); + } + + + /** + * 修改资产信息 + */ + @PreAuthorize("@ss.hasPermi('lzbi:assetInfo:edit')") + @Log(title = "资产信息", businessType = BusinessType.UPDATE) + @PutMapping("/editBatch") + public AjaxResult editBatch(@RequestBody JSONArray jsonArray) + { + if (jsonArray == null) { + throw new IllegalArgumentException("未能接收任何参数！"); + } + List beanList = new ArrayList<>(); + try { + for (int i = 0; i < jsonArray.size(); i++) { + JSONObject beanObject = jsonArray.getJSONObject(i); + DcBaseAssetTarget dcBaseAssetTarget = JSON.toJavaObject(beanObject, DcBaseAssetTarget.class); + dcBaseAssetTarget.setUpdatedBy(String.valueOf(getUserId())); + dcBaseAssetTarget.setUpdatedTime(DateUtils.getNowDate()); + beanList.add(dcBaseAssetTarget); + } + } catch (Exception e) { + throw new IllegalArgumentException("解析list对象异常！"); + } + return toAjax(dcBaseAssetTargetService.updateBatchById(beanList)); + } + + + } diff --git a/lzbi-module/src/main/java/com/lzbi/targetFolder/controller/DcBaseTargetModelController.java b/lzbi-module/src/main/java/com/lzbi/targetFolder/controller/DcBaseTargetModelController.java index a891afd..c8a348e 100644 --- a/lzbi-module/src/main/java/com/lzbi/targetFolder/controller/DcBaseTargetModelController.java +++ b/lzbi-module/src/main/java/com/lzbi/targetFolder/controller/DcBaseTargetModelController.java @@ -197,6 +197,21 @@ public class DcBaseTargetModelController extends BaseController } + /** + * 查询指标模版配置列表 + */ + @ApiOperation("查询指标模版配置列表") + @ApiImplicitParams({ + @ApiImplicitParam(name = "DcBaseTargetModel", value = "", dataType = "DcBaseTargetModel", dataTypeClass = DcBaseTargetModel.class), + }) + @PreAuthorize("@ss.hasPermi('target:targetModel:list')") + @GetMapping("/listNoPage") + public AjaxResult listNoPage(DcBaseTargetModel DcBaseTargetModel) + { + List< DcBaseTargetModel> list = dcBaseTargetModelService.selectDcBaseTargetModelList(DcBaseTargetModel); + return AjaxResult.success(list); + } + } diff --git a/lzbi-module/src/main/java/com/lzbi/targetFolder/domain/DcBaseAssetTargetDao.java b/lzbi-module/src/main/java/com/lzbi/targetFolder/domain/DcBaseAssetTarget.java similarity index 66% rename from lzbi-module/src/main/java/com/lzbi/targetFolder/domain/DcBaseAssetTargetDao.java rename to lzbi-module/src/main/java/com/lzbi/targetFolder/domain/DcBaseAssetTarget.java index c017b6f..427f0e9 100644 --- a/lzbi-module/src/main/java/com/lzbi/targetFolder/domain/DcBaseAssetTargetDao.java +++ b/lzbi-module/src/main/java/com/lzbi/targetFolder/domain/DcBaseAssetTarget.java @@ -2,32 +2,29 @@ package com.lzbi.targetFolder.domain; import java.math.BigDecimal; import java.util.Date; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import io.swagger.annotations.ApiModelProperty; +import lombok.experimental.Accessors; import lombok.Data; import com.lzbi.common.annotation.Excel; import com.lzbi.module.base.BaseModuleEntity; -import lombok.experimental.Accessors; /** * 资产指标配置对象 dc_base_asset_target - * + * * @author Lu.JL - * @date 2023-11-30 + * @date 2023-12-14 */ - @Data - @Accessors(chain = true) -public class DcBaseAssetTargetDao extends BaseModuleEntity +@Data +@Accessors(chain = true) +public class DcBaseAssetTarget extends BaseModuleEntity { private static final long serialVersionUID = 1L; - @TableId(value = "id", type = IdType.AUTO) - /** 主键 */ - private Long id; - /** 资产ID */ - @Excel(name = "资产ID") + /** 统计单元编码 */ + @Excel(name = "统计单元编码") + private String assetCode; + + /** 统计单元ID */ + @Excel(name = "统计单元ID") private Long assetId; /** 指标模型编码 */ @@ -38,6 +35,7 @@ public class DcBaseAssetTargetDao extends BaseModuleEntity @Excel(name = "指标名称") private String targetName; + /** 指标别名 */ @Excel(name = "指标别名") private String targetNameAlias; @@ -73,32 +71,20 @@ public class DcBaseAssetTargetDao extends BaseModuleEntity @Excel(name = "是否积算") private String flagCompute; - /** 排序 */ - @Excel(name = "排序") + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") private String sort; - /** 统计单元编码 */ - @Excel(name = "统计单元编码") - private String assetCode; - //add by zhousq 2023-12-12 - @ApiModelProperty("所属专业名称") + /** 所属专业名称 */ + @Excel(name = "所属专业名称") private String targetFieldName; - @ApiModelProperty("单位") - private String fieldUnit; - @ApiModelProperty("字段类型") - private String columnType; - - private String value; - private String label; - public String getValue() { - return this.targetCode; - } - - - public String getLabel() { - return this.targetCode; - } + /** T指标P参数 */ + @Excel(name = "T指标P参数") + private String columnType; + /** 单位 */ + @Excel(name = "单位") + private String fieldUnit; } diff --git a/lzbi-module/src/main/java/com/lzbi/targetFolder/mapper/DcBaseAssetTargetMapper.java b/lzbi-module/src/main/java/com/lzbi/targetFolder/mapper/DcBaseAssetTargetMapper.java index 83d0fd4..f647a4b 100644 --- a/lzbi-module/src/main/java/com/lzbi/targetFolder/mapper/DcBaseAssetTargetMapper.java +++ b/lzbi-module/src/main/java/com/lzbi/targetFolder/mapper/DcBaseAssetTargetMapper.java @@ -1,7 +1,8 @@ package com.lzbi.targetFolder.mapper; import java.util.List; -import com.lzbi.targetFolder.domain.DcBaseAssetTargetDao; + +import com.lzbi.targetFolder.domain.DcBaseAssetTarget; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -14,7 +15,7 @@ import org.apache.ibatis.annotations.Param; */ @Mapper -public interface DcBaseAssetTargetMapper extends BaseMapper +public interface DcBaseAssetTargetMapper extends BaseMapper { /** * 查询资产指标配置 @@ -22,7 +23,7 @@ public interface DcBaseAssetTargetMapper extends BaseMapper selectDcBaseAssetTargetDaoList(DcBaseAssetTargetDao dcBaseAssetTargetDao); + public List selectDcBaseAssetTargetList(DcBaseAssetTarget dcBaseAssetTarget); /** * 新增资产指标配置 * - * @param dcBaseAssetTargetDao 资产指标配置 + * @param dcBaseAssetTarget 资产指标配置 * @return 结果 */ - public int insertDcBaseAssetTargetDao(DcBaseAssetTargetDao dcBaseAssetTargetDao); + public int insertDcBaseAssetTarget(DcBaseAssetTarget dcBaseAssetTarget); /** * 修改资产指标配置 @@ -55,7 +56,7 @@ public interface DcBaseAssetTargetMapper extends BaseMapper implements IService +public class DcBaseAssetTargetService extends ServiceImpl implements IService { @Autowired private DcBaseAssetTargetMapper dcBaseAssetTargetMapper; @@ -27,46 +27,46 @@ public class DcBaseAssetTargetService extends ServiceImpl selectDcBaseAssetTargetDaoList(DcBaseAssetTargetDao dcBaseAssetTargetDao) + public List selectDcBaseAssetTargetList(DcBaseAssetTarget dcBaseAssetTarget) { - return dcBaseAssetTargetMapper.selectDcBaseAssetTargetDaoList(dcBaseAssetTargetDao); + return dcBaseAssetTargetMapper.selectDcBaseAssetTargetList(dcBaseAssetTarget); } /** * 新增资产指标配置 * - * @param dcBaseAssetTargetDao 资产指标配置 + * @param dcBaseAssetTarget 资产指标配置 * @return 结果 */ - public int insertDcBaseAssetTargetDao(DcBaseAssetTargetDao dcBaseAssetTargetDao) + public int insertDcBaseAssetTarget(DcBaseAssetTarget dcBaseAssetTarget) { - dcBaseAssetTargetDao.setCreatedTime(DateUtils.getNowDate()); - return dcBaseAssetTargetMapper.insertDcBaseAssetTargetDao(dcBaseAssetTargetDao); + dcBaseAssetTarget.setCreatedTime(DateUtils.getNowDate()); + return dcBaseAssetTargetMapper.insertDcBaseAssetTarget(dcBaseAssetTarget); } /** * 修改资产指标配置 * - * @param dcBaseAssetTargetDao 资产指标配置 + * @param dcBaseAssetTarget 资产指标配置 * @return 结果 */ - public int updateDcBaseAssetTargetDao(DcBaseAssetTargetDao dcBaseAssetTargetDao) + public int updateDcBaseAssetTarget(DcBaseAssetTarget dcBaseAssetTarget) { - dcBaseAssetTargetDao.setUpdatedTime(DateUtils.getNowDate()); - return dcBaseAssetTargetMapper.updateDcBaseAssetTargetDao(dcBaseAssetTargetDao); + dcBaseAssetTarget.setUpdatedTime(DateUtils.getNowDate()); + return dcBaseAssetTargetMapper.updateDcBaseAssetTarget(dcBaseAssetTarget); } /** @@ -76,9 +76,9 @@ public class DcBaseAssetTargetService extends ServiceImpl - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - select TENANT_ID, - REVISION, - CREATED_BY, - CREATED_TIME, - UPDATED_BY, - UPDATED_TIME, - DELETE_BY, - DELETE_TIME, - id, - asset_name, - asset_code, - asset_class, - flag_validate_dept, - flag_validate_role, - flag_validate_user, - status_asset, - comany_id, - dept_id - from dc_base_asset_info + select tenant_id, revision, created_by, created_time, updated_by, updated_time, delete_by, delete_time, id, asset_name, asset_code, asset_class, flag_validate_dept, flag_validate_role, flag_validate_user, status_asset, comany_id, dept_id, user_id from dc_base_asset_info + + - - - insert into dc_base_asset_info - TENANT_ID, - REVISION, - CREATED_BY, - CREATED_TIME, - UPDATED_BY, - UPDATED_TIME, - DELETE_BY, - DELETE_TIME, + tenant_id, + revision, + created_by, + created_time, + updated_by, + updated_time, + delete_by, + delete_time, asset_name, asset_code, asset_class, @@ -101,10 +71,11 @@ status_asset, comany_id, dept_id, + user_id, #{tenantId}, - #{REVISION}, + #{revision}, #{createdBy}, #{createdTime}, #{updatedBy}, @@ -120,20 +91,21 @@ #{statusAsset}, #{comanyId}, #{deptId}, + #{userId}, update dc_base_asset_info - TENANT_ID = #{tenantId}, - REVISION = #{REVISION}, - CREATED_BY = #{createdBy}, - CREATED_TIME = #{createdTime}, - UPDATED_BY = #{updatedBy}, - UPDATED_TIME = #{updatedTime}, - DELETE_BY = #{deleteBy}, - DELETE_TIME = #{deleteTime}, + tenant_id = #{tenantId}, + revision = #{revision}, + created_by = #{createdBy}, + created_time = #{createdTime}, + updated_by = #{updatedBy}, + updated_time = #{updatedTime}, + delete_by = #{deleteBy}, + delete_time = #{deleteTime}, asset_name = #{assetName}, asset_code = #{assetCode}, asset_class = #{assetClass}, @@ -143,14 +115,13 @@ status_asset = #{statusAsset}, comany_id = #{comanyId}, dept_id = #{deptId}, + user_id = #{userId}, where id = #{id} - delete - from dc_base_asset_info - where id = #{id} + delete from dc_base_asset_info where id = #{id} diff --git a/lzbi-module/src/main/resources/mapper/targetFolder/DcBaseAssetTargetMapper.xml b/lzbi-module/src/main/resources/mapper/targetFolder/DcBaseAssetTargetMapper.xml index c3ac296..cfc5b45 100644 --- a/lzbi-module/src/main/resources/mapper/targetFolder/DcBaseAssetTargetMapper.xml +++ b/lzbi-module/src/main/resources/mapper/targetFolder/DcBaseAssetTargetMapper.xml @@ -3,13 +3,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - + + - + + @@ -18,7 +19,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - @@ -27,19 +27,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - + - select id, asset_id,asset_code, target_model_code, target_name, target_code, target_field, limit_up, limit_down, value_base, flag_avg, flag_sum, flag_compute, sort, tenant_id, revision, created_by, created_time, updated_by, updated_time, delete_by, delete_time,target_field_name - value_type, - field_unit - from dc_base_asset_target + select id, asset_code, asset_id, target_model_code, target_name, target_name_alias, target_code, target_field, limit_up, limit_down, value_base, flag_avg, flag_sum, flag_compute, tenant_id, revision, created_by, created_time, updated_by, updated_time, delete_by, delete_time, sort, target_field_name, column_type, field_unit from dc_base_asset_target - and asset_id = #{assetId} @@ -53,17 +51,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - where id = #{id} - - + + insert into dc_base_asset_target + asset_code, asset_id, target_model_code, target_name, + target_name_alias, target_code, target_field, limit_up, @@ -72,7 +72,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" flag_avg, flag_sum, flag_compute, - sort, tenant_id, revision, created_by, @@ -81,11 +80,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" updated_time, delete_by, delete_time, - + sort, + target_field_name, + column_type, + field_unit, + + #{assetCode}, #{assetId}, #{targetModelCode}, #{targetName}, + #{targetNameAlias}, #{targetCode}, #{targetField}, #{limitUp}, @@ -94,7 +99,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{flagAvg}, #{flagSum}, #{flagCompute}, - #{sort}, #{tenantId}, #{revision}, #{createdBy}, @@ -103,15 +107,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updatedTime}, #{deleteBy}, #{deleteTime}, - + #{sort}, + #{targetFieldName}, + #{columnType}, + #{fieldUnit}, + - + update dc_base_asset_target + asset_code = #{assetCode}, asset_id = #{assetId}, target_model_code = #{targetModelCode}, target_name = #{targetName}, + target_name_alias = #{targetNameAlias}, target_code = #{targetCode}, target_field = #{targetField}, limit_up = #{limitUp}, @@ -120,7 +130,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" flag_avg = #{flagAvg}, flag_sum = #{flagSum}, flag_compute = #{flagCompute}, - sort = #{sort}, tenant_id = #{tenantId}, revision = #{revision}, created_by = #{createdBy}, @@ -129,15 +138,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" updated_time = #{updatedTime}, delete_by = #{deleteBy}, delete_time = #{deleteTime}, + sort = #{sort}, + target_field_name = #{targetFieldName}, + column_type = #{columnType}, + field_unit = #{fieldUnit}, where id = #{id} - + delete from dc_base_asset_target where id = #{id} - + delete from dc_base_asset_target where id in #{id} From e6cd12b40ee7f3563e4fe1194f9b4c59b01d94a9 Mon Sep 17 00:00:00 2001 From: bobol Date: Mon, 18 Dec 2023 17:47:26 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 12 +- .../lzbi/common/config/TargetModelConfig.java | 50 +++++ .../com/lzbi/bi/domain/CalorificValueVO.java | 2 +- .../lzbi/bi/domain/ConsumesStatisticsDTO.java | 32 +++ .../bi/domain/CorporateStatisticsDTO.java | 36 +++ .../com/lzbi/bi/domain/HeatSuppliedVO.java | 14 +- ...ovideAnswerWaterAverageTemperatureReq.java | 28 +++ .../service/DcBusiDataScreenNewService.java | 212 ++++++++++++++---- .../draft/domain/DcBusiTargetDraftDay.java | 6 + .../draft/domain/DcBusiTargetDraftMonth.java | 10 + .../mapper/DcBusiTargetDraftDayMapper.java | 19 +- .../mapper/DcBusiTargetDraftMonthMapper.java | 1 + .../asset/DcBusiTargetDraftMonthMapper.xml | 36 +-- ...per.xml => DcBusiTargetDraftDayMapper.xml} | 165 +++++++++----- 14 files changed, 498 insertions(+), 125 deletions(-) create mode 100644 lzbi-module/src/main/java/com/lzbi/bi/domain/ConsumesStatisticsDTO.java create mode 100644 lzbi-module/src/main/java/com/lzbi/bi/domain/CorporateStatisticsDTO.java create mode 100644 lzbi-module/src/main/java/com/lzbi/bi/domain/ProvideAnswerWaterAverageTemperatureReq.java rename lzbi-module/src/main/resources/mapper/draft/{DcBusiTargetDraftMonthMapper.xml => DcBusiTargetDraftDayMapper.xml} (74%) diff --git a/lzbi-admin/src/main/resources/application-dev.yml b/lzbi-admin/src/main/resources/application-dev.yml index ba0b3a5..c57a77c 100644 --- a/lzbi-admin/src/main/resources/application-dev.yml +++ b/lzbi-admin/src/main/resources/application-dev.yml @@ -108,4 +108,14 @@ logging: org.springframework: warn # 指标模板 target-model: - user: TM00051 + user: TM000YH # 用户 + boiler: TM000GL # 锅炉 + electricityConsumes: TM000DH #电耗 + waterConsumes: TM000SH # 水耗 + coalConsumes: TM000MH # 煤耗 + calorific: TM000FRL # 发热量 + heatSupplied: TM000GRL # 供热量 + acreage: MJ01 # 面积 + outputOfPlant: TM000FDL # 发电量 + provideWaterAverageTemperature: TM000GSJW # 供水均温 + answerWaterAverageTemperature: TM000HSJW # 回水均温 diff --git a/lzbi-common/src/main/java/com/lzbi/common/config/TargetModelConfig.java b/lzbi-common/src/main/java/com/lzbi/common/config/TargetModelConfig.java index 7051558..a251e5e 100644 --- a/lzbi-common/src/main/java/com/lzbi/common/config/TargetModelConfig.java +++ b/lzbi-common/src/main/java/com/lzbi/common/config/TargetModelConfig.java @@ -16,4 +16,54 @@ public class TargetModelConfig { * 用户 */ private String user; + + /** + * 锅炉 + */ + private String boiler; + + /** + * 电耗 + */ + private String electricityConsumes; + + /** + * 水耗 + */ + private String waterConsumes; + + /** + * 煤耗 + */ + private String coalConsumes; + + /** + * 发热量 + */ + private String calorific; + + /** + * 供热量 + */ + private String heatSupplied; + + /** + * 面积 + */ + private String acreage; + + /** + * 发电量 + */ + private String outputOfPlant; + + /** + * 供水均温 + */ + private String provideWaterAverageTemperature; + + /** + * 回水均温 + */ + private String answerWaterAverageTemperature; } diff --git a/lzbi-module/src/main/java/com/lzbi/bi/domain/CalorificValueVO.java b/lzbi-module/src/main/java/com/lzbi/bi/domain/CalorificValueVO.java index 4cd5004..76e7ba6 100644 --- a/lzbi-module/src/main/java/com/lzbi/bi/domain/CalorificValueVO.java +++ b/lzbi-module/src/main/java/com/lzbi/bi/domain/CalorificValueVO.java @@ -24,5 +24,5 @@ public class CalorificValueVO { /** * 百分比 */ - private double percentage; + private int percentage; } diff --git a/lzbi-module/src/main/java/com/lzbi/bi/domain/ConsumesStatisticsDTO.java b/lzbi-module/src/main/java/com/lzbi/bi/domain/ConsumesStatisticsDTO.java new file mode 100644 index 0000000..f215bc2 --- /dev/null +++ b/lzbi-module/src/main/java/com/lzbi/bi/domain/ConsumesStatisticsDTO.java @@ -0,0 +1,32 @@ +package com.lzbi.bi.domain; + +import lombok.Data; + +@Data +public class ConsumesStatisticsDTO { + + /** + * 公司id + */ + private Long companyId; + /** + * 年 + */ + private String year; + /** + * 月 + */ + private String month; + /** + * 电耗指标模板 + */ + private String electricityConsumes; + /** + * 水耗指标模板 + */ + private String waterConsumes; + /** + * 煤耗指标模板 + */ + private String coalConsumes; +} diff --git a/lzbi-module/src/main/java/com/lzbi/bi/domain/CorporateStatisticsDTO.java b/lzbi-module/src/main/java/com/lzbi/bi/domain/CorporateStatisticsDTO.java new file mode 100644 index 0000000..742449a --- /dev/null +++ b/lzbi-module/src/main/java/com/lzbi/bi/domain/CorporateStatisticsDTO.java @@ -0,0 +1,36 @@ +package com.lzbi.bi.domain; + +import lombok.Data; + +@Data +public class CorporateStatisticsDTO { + + /** + * 公司id + */ + private Long companyId; + /** + * 年 + */ + private String year; + /** + * 月 + */ + private String month; + /** + * 面积 + */ + private String acreage; + /** + * 发电量 + */ + private String outputOfPlant; + /** + * 发热量 + */ + private String calorificValue; + /** + * 供热量 + */ + private String heatSupplied; +} diff --git a/lzbi-module/src/main/java/com/lzbi/bi/domain/HeatSuppliedVO.java b/lzbi-module/src/main/java/com/lzbi/bi/domain/HeatSuppliedVO.java index 531b241..c4b09dc 100644 --- a/lzbi-module/src/main/java/com/lzbi/bi/domain/HeatSuppliedVO.java +++ b/lzbi-module/src/main/java/com/lzbi/bi/domain/HeatSuppliedVO.java @@ -1,6 +1,8 @@ package com.lzbi.bi.domain; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import java.math.BigDecimal; import java.util.List; @@ -11,7 +13,17 @@ import java.util.List; @Data public class HeatSuppliedVO { - private List labelArr; + private List - 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_date, val_original, val_adjust, val_result, tenant_id, revision, created_by, created_time, updated_by, updated_time, delete_by, delete_time from dc_busi_target_draft_day + 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_date, count_year, count_month val_original, val_adjust, val_result, tenant_id, revision, created_by, created_time, updated_by, updated_time, delete_by, delete_time from dc_busi_target_draft_month @@ -55,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - insert into dc_busi_target_draft_day + insert into dc_busi_target_draft_month company_name, company_id, @@ -111,7 +119,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update dc_busi_target_draft_day + update dc_busi_target_draft_month company_name = #{companyName}, company_id = #{companyId}, @@ -142,11 +150,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from dc_busi_target_draft_day where id = #{id} + delete from dc_busi_target_draft_month where id = #{id} - delete from dc_busi_target_draft_day where id in + delete from dc_busi_target_draft_month where id in #{id} diff --git a/lzbi-module/src/main/resources/mapper/draft/DcBusiTargetDraftMonthMapper.xml b/lzbi-module/src/main/resources/mapper/draft/DcBusiTargetDraftDayMapper.xml similarity index 74% rename from lzbi-module/src/main/resources/mapper/draft/DcBusiTargetDraftMonthMapper.xml rename to lzbi-module/src/main/resources/mapper/draft/DcBusiTargetDraftDayMapper.xml index f4a7873..9956932 100644 --- a/lzbi-module/src/main/resources/mapper/draft/DcBusiTargetDraftMonthMapper.xml +++ b/lzbi-module/src/main/resources/mapper/draft/DcBusiTargetDraftDayMapper.xml @@ -21,6 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -66,11 +67,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - 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_day + 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_accumulative, 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_day + + + +