From 057fd51213518cb6bcc92f75556d77900abaf7fa Mon Sep 17 00:00:00 2001 From: winter Date: Sat, 20 Jul 2024 14:33:06 +0800 Subject: [PATCH] fix --- .../resources/db/migration/V202407018.sql | 14 ------ .../iformall/domain/po/WxEnergyMeterUser.java | 41 ---------------- .../mapper/WxEnergyMeterUserMapper.java | 17 ------- .../service/impl/WxEnergyServiceImpl.java | 10 ---- .../mapper/WxEnergyMeterUserMapper.xml | 48 ------------------- 5 files changed, 130 deletions(-) delete mode 100644 mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeterUser.java delete mode 100644 mallinkService/src/main/java/com/iformall/mapper/WxEnergyMeterUserMapper.java delete mode 100644 mallinkService/src/main/resources/mapper/WxEnergyMeterUserMapper.xml diff --git a/mallinkAdmin/src/main/resources/db/migration/V202407018.sql b/mallinkAdmin/src/main/resources/db/migration/V202407018.sql index f3d044198..a67e7e3bc 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202407018.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202407018.sql @@ -16,20 +16,6 @@ CREATE TABLE `wx_energy_meter` ( UNIQUE KEY `id_UNIQUE` (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='能耗表'; - -CREATE TABLE `wx_energy_meter_user` ( - `id` bigint(20) NOT NULL COMMENT '主键ID', - `tenant_id` varchar(5) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID', - `parent_tenant_id` varchar(5) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID', - `create_time` timestamp NULL DEFAULT NULL, - `update_time` timestamp NULL DEFAULT NULL, - `user_id` bigint(20) NOT NULL COMMENT '使用者id,商铺id或者楼层id', - `user_type` int(3) NOT NULL COMMENT '使用者类型', - `meter_id` bigint(20) NOT NULL COMMENT '表ID', - PRIMARY KEY (`id`), - UNIQUE KEY `id_UNIQUE` (`id`), -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='能耗表'; - CREATE TABLE `wx_energy_meter_reading` ( `id` bigint(20) NOT NULL COMMENT '主键ID', `tenant_id` varchar(5) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID', diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeterUser.java b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeterUser.java deleted file mode 100644 index dca7edb19..000000000 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeterUser.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.iformall.domain.po; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.TenantEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import java.util.Date; - -/** - */ -@TableName(value = "wx_energy_meter_user") -@Data -@ToString(callSuper = true) -@EqualsAndHashCode(callSuper = true) -public class WxEnergyMeterUser extends TenantEntity { - - private static final long serialVersionUID = 7009117540201976664L; - - @io.swagger.annotations.ApiModelProperty(value="id",name="id") - private Long id; - - @io.swagger.annotations.ApiModelProperty(value="name",name="name") - private String name; - - @io.swagger.annotations.ApiModelProperty(value="createTime",name="createTime") - private Date createTime; - - @io.swagger.annotations.ApiModelProperty(value="updateTime",name="updateTime") - private Date updateTime; - - @io.swagger.annotations.ApiModelProperty(value = "userId", name = "userId") - private Long userId; - - @io.swagger.annotations.ApiModelProperty(value = "EnumEnergyMeterUserType", name = "userType") - private Integer userType; - - @io.swagger.annotations.ApiModelProperty(value = "表ID", name = "meterId") - private Long meterId; - -} diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxEnergyMeterUserMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxEnergyMeterUserMapper.java deleted file mode 100644 index 5f4ebdd69..000000000 --- a/mallinkService/src/main/java/com/iformall/mapper/WxEnergyMeterUserMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.iformall.mapper; - -import com.iformall.common.CommonMapper; -import com.iformall.domain.po.WxEnergyMeter; -import com.iformall.domain.po.WxEnergyMeterUser; - -import org.apache.ibatis.annotations.Param; -import java.util.List; -import java.util.Map; - -/** - */ -public interface WxEnergyMeterUserMapper extends CommonMapper { - - List findList(WxEnergyMeterUser wxBillRent); - -} diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java index ca7f2bba7..4ee6710f3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java @@ -9,28 +9,22 @@ import com.iformall.common.IdWorker; import com.iformall.common.Result; import com.iformall.domain.po.*; import com.iformall.domain.po.base.TenantEntity; -import com.iformall.enums.EnumEnergyMeterUserType; import com.iformall.enums.EnumEnergyPublicCalcuteRule; import com.iformall.enums.EnumYesOrNo; import com.iformall.exception.MallinkException; import com.iformall.mapper.*; import com.iformall.service.*; -import com.iformall.utils.Constant; - import cn.afterturn.easypoi.excel.ExcelImportUtil; import cn.afterturn.easypoi.excel.entity.ImportParams; import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult; import cn.afterturn.easypoi.handler.impl.ExcelDataHandlerDefaultImpl; import cn.afterturn.easypoi.handler.inter.IExcelDataHandler; - -import org.apache.shiro.session.UnknownSessionException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; - import java.io.BufferedInputStream; import java.io.File; import java.io.FileOutputStream; @@ -38,8 +32,6 @@ import java.io.IOException; import java.math.BigDecimal; import java.math.RoundingMode; import java.util.*; -import java.util.concurrent.TimeUnit; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -52,8 +44,6 @@ public class WxEnergyServiceImpl implements WxEnergyService { @Autowired WxEnergyMeterMapper wxEnergyMeterMapper; @Autowired - WxEnergyMeterUserMapper wxEnergyMeterUserMapper; - @Autowired WxEnergyMeterReadingMapper wxEnergyMeterReadingMapper; @Autowired WxEnergyFeesTimeMapper wxEnergyFeesTimeMapper; diff --git a/mallinkService/src/main/resources/mapper/WxEnergyMeterUserMapper.xml b/mallinkService/src/main/resources/mapper/WxEnergyMeterUserMapper.xml deleted file mode 100644 index 60c77b505..000000000 --- a/mallinkService/src/main/resources/mapper/WxEnergyMeterUserMapper.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - `id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`user_id`,`user_type`,`meter_id` - - - - where 1=1 - and `id` = #{id} - - and `tenant_id` = #{tenantId} - - - and `parent_tenant_id` = #{parentTenantId} - - and `user_id` = #{userId} - and `user_type` = #{userType} - and `meter_id` = #{meterId} - - and id in - - #{idItem} - - - order by ${sortColumns} - - - - - -