更改能源费率

module_base/src/main/java/org/jeecg/modules/energyRate/mapper/EnergyRateDetailMapper.java

@@ -0,0 +1,31 @@
+package org.jeecg.modules.energyRate.mapper;
+
+import java.util.List;
+import org.jeecg.modules.energyRate.entity.EnergyRateDetail;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * @Description: base_energy_rate_detail
+ * @Author: jeecg-boot
+ * @Date:   2024-01-23
+ * @Version: V1.0
+ */
+public interface EnergyRateDetailMapper extends BaseMapper<EnergyRateDetail> {
+
+	/**
+	 * 通过主表id删除子表数据
+	 *
+	 * @param mainId 主表id
+	 * @return boolean
+	 */
+	public boolean deleteByMainId(@Param("mainId") String mainId);
+
+  /**
+   * 通过主表id查询子表数据
+   *
+   * @param mainId 主表id
+   * @return List<BaseEnergyRateDetail>
+   */
+	public List<EnergyRateDetail> selectByMainId(@Param("mainId") String mainId);
+}

module_base/src/main/java/org/jeecg/modules/energyRate/mapper/EnergyRateMapper.java

@@ -1,13 +1,10 @@
 package org.jeecg.modules.energyRate.mapper;
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.energyRate.entity.EnergyRate;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
- * @Description: 能源费率
+ * @Description: base_energy_rate
  * @Author: jeecg-boot
  * @Date:   2024-01-23
  * @Version: V1.0

module_base/src/main/java/org/jeecg/modules/energyRate/mapper/xml/EnergyRateDetailMapper.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.energyRate.mapper.EnergyRateDetailMapper">
+
+	<delete id="deleteByMainId" parameterType="java.lang.String">
+		DELETE 
+		FROM  base_energy_rate_detail 
+		WHERE
+			 energyrateid = #{mainId} 	</delete>
+	
+	<select id="selectByMainId" parameterType="java.lang.String" resultType="org.jeecg.modules.energyRate.entity.EnergyRateDetail">
+		SELECT * 
+		FROM  base_energy_rate_detail
+		WHERE
+			 energyrateid = #{mainId} 	</select>
+</mapper>

module_base/src/main/java/org/jeecg/modules/energyRate/mapper/xml/EnergyRateMapper.xml

@@ -2,4 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.energyRate.mapper.EnergyRateMapper">
 
-</mapper>
+</mapper>

module_base/src/main/java/org/jeecg/modules/energyRate/service/IEnergyRateDetailService.java

@@ -0,0 +1,22 @@
+package org.jeecg.modules.energyRate.service;
+
+import org.jeecg.modules.energyRate.entity.EnergyRateDetail;
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
+/**
+ * @Description: base_energy_rate_detail
+ * @Author: jeecg-boot
+ * @Date:   2024-01-23
+ * @Version: V1.0
+ */
+public interface IEnergyRateDetailService extends IService<EnergyRateDetail> {
+
+	/**
+	 * 通过主表id查询子表数据
+	 *
+	 * @param mainId 主表id
+	 * @return List<BaseEnergyRateDetail>
+	 */
+	public List<EnergyRateDetail> selectByMainId(String mainId);
+}

module_base/src/main/java/org/jeecg/modules/energyRate/service/IEnergyRateService.java

@@ -1,14 +1,48 @@
 package org.jeecg.modules.energyRate.service;
 
+import org.jeecg.modules.energyRate.entity.EnergyRateDetail;
 import org.jeecg.modules.energyRate.entity.EnergyRate;
 import com.baomidou.mybatisplus.extension.service.IService;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.List;
 
 /**
- * @Description: 能源费率
+ * @Description: base_energy_rate
  * @Author: jeecg-boot
  * @Date:   2024-01-23
  * @Version: V1.0
  */
 public interface IEnergyRateService extends IService<EnergyRate> {
 
+	/**
+	 * 添加一对多
+	 *
+	 * @param energyRate
+	 * @param energyRateDetailList
+	 */
+	public void saveMain(EnergyRate energyRate, List<EnergyRateDetail> energyRateDetailList) ;
+	
+	/**
+	 * 修改一对多
+	 *
+	 * @param energyRate
+	 * @param energyRateDetailList
+	 */
+	public void updateMain(EnergyRate energyRate, List<EnergyRateDetail> energyRateDetailList);
+	
+	/**
+	 * 删除一对多
+	 *
+	 * @param id
+	 */
+	public void delMain (String id);
+	
+	/**
+	 * 批量删除一对多
+	 *
+	 * @param idList
+	 */
+	public void delBatchMain (Collection<? extends Serializable> idList);
+	
 }

module_base/src/main/java/org/jeecg/modules/energyRate/service/impl/EnergyRateDetailServiceImpl.java

@@ -0,0 +1,27 @@
+package org.jeecg.modules.energyRate.service.impl;
+
+import org.jeecg.modules.energyRate.entity.EnergyRateDetail;
+import org.jeecg.modules.energyRate.mapper.EnergyRateDetailMapper;
+import org.jeecg.modules.energyRate.service.IEnergyRateDetailService;
+import org.springframework.stereotype.Service;
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * @Description: base_energy_rate_detail
+ * @Author: jeecg-boot
+ * @Date:   2024-01-23
+ * @Version: V1.0
+ */
+@Service
+public class EnergyRateDetailServiceImpl extends ServiceImpl<EnergyRateDetailMapper, EnergyRateDetail> implements IEnergyRateDetailService {
+	
+	@Autowired
+	private EnergyRateDetailMapper energyRateDetailMapper;
+	
+	@Override
+	public List<EnergyRateDetail> selectByMainId(String mainId) {
+		return energyRateDetailMapper.selectByMainId(mainId);
+	}
+}

module_base/src/main/java/org/jeecg/modules/energyRate/service/impl/EnergyRateServiceImpl.java

@@ -1,14 +1,20 @@
 package org.jeecg.modules.energyRate.service.impl;
 
 import org.jeecg.modules.energyRate.entity.EnergyRate;
+import org.jeecg.modules.energyRate.entity.EnergyRateDetail;
+import org.jeecg.modules.energyRate.mapper.EnergyRateDetailMapper;
 import org.jeecg.modules.energyRate.mapper.EnergyRateMapper;
 import org.jeecg.modules.energyRate.service.IEnergyRateService;
 import org.springframework.stereotype.Service;
-
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import java.io.Serializable;
+import java.util.List;
+import java.util.Collection;
 
 /**
- * @Description: 能源费率
+ * @Description: base_energy_rate
  * @Author: jeecg-boot
  * @Date:   2024-01-23
  * @Version: V1.0
@@ -16,4 +22,56 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class EnergyRateServiceImpl extends ServiceImpl<EnergyRateMapper, EnergyRate> implements IEnergyRateService {
 
+	@Autowired
+	private EnergyRateMapper energyRateMapper;
+	@Autowired
+	private EnergyRateDetailMapper energyRateDetailMapper;
+	
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void saveMain(EnergyRate energyRate, List<EnergyRateDetail> energyRateDetailList) {
+		energyRateMapper.insert(energyRate);
+		if(energyRateDetailList !=null && energyRateDetailList.size()>0) {
+			for(EnergyRateDetail entity: energyRateDetailList) {
+				//外键设置
+				entity.setEnergyrateid(energyRate.getId());
+				energyRateDetailMapper.insert(entity);
+			}
+		}
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void updateMain(EnergyRate energyRate, List<EnergyRateDetail> energyRateDetailList) {
+		energyRateMapper.updateById(energyRate);
+		
+		//1.先删除子表数据
+		energyRateDetailMapper.deleteByMainId(energyRate.getId());
+		
+		//2.子表数据重新插入
+		if(energyRateDetailList !=null && energyRateDetailList.size()>0) {
+			for(EnergyRateDetail entity: energyRateDetailList) {
+				//外键设置
+				entity.setEnergyrateid(energyRate.getId());
+				energyRateDetailMapper.insert(entity);
+			}
+		}
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void delMain(String id) {
+		energyRateDetailMapper.deleteByMainId(id);
+		energyRateMapper.deleteById(id);
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void delBatchMain(Collection<? extends Serializable> idList) {
+		for(Serializable id:idList) {
+			energyRateDetailMapper.deleteByMainId(id.toString());
+			energyRateMapper.deleteById(id);
+		}
+	}
+	
 }

module_base/src/main/java/org/jeecg/modules/energyRate/vo/EnergyRatePage.java

@@ -0,0 +1,81 @@
+package org.jeecg.modules.energyRate.vo;
+
+import java.util.List;
+
+import org.jeecg.modules.energyRate.entity.EnergyRateDetail;
+import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecgframework.poi.excel.annotation.ExcelCollection;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @Description: base_energy_rate
+ * @Author: jeecg-boot
+ * @Date:   2024-01-23
+ * @Version: V1.0
+ */
+@Data
+@ApiModel(value="base_energy_ratePage对象", description="base_energy_rate")
+public class EnergyRatePage {
+
+	/**能源费率ID*/
+	@Excel(name = "能源费率ID", width = 15)
+	@ApiModelProperty(value = "能源费率ID")
+    private java.lang.Integer energyrateid;
+	/**创建者*/
+	@ApiModelProperty(value = "创建者")
+    private java.lang.String createBy;
+	/**创建时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@ApiModelProperty(value = "创建时间")
+    private java.util.Date createTime;
+	/**更新者*/
+	@ApiModelProperty(value = "更新者")
+    private java.lang.String updateBy;
+	/**更新时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@ApiModelProperty(value = "更新时间")
+    private java.util.Date updateTime;
+	/**备注*/
+	@Excel(name = "备注", width = 15)
+	@ApiModelProperty(value = "备注")
+    private java.lang.String remark;
+	/**名称*/
+	@Excel(name = "名称", width = 15)
+	@ApiModelProperty(value = "名称")
+    private java.lang.String name;
+	/**能源分类ID*/
+	@Excel(name = "能源分类ID", width = 15)
+	@ApiModelProperty(value = "能源分类ID")
+    private java.lang.Integer energytypeid;
+	/**费率类型：分时费率、阶梯费率*/
+	@Excel(name = "费率类型：分时费率、阶梯费率", width = 15)
+	@ApiModelProperty(value = "费率类型：分时费率、阶梯费率")
+    private java.lang.String ratetype;
+	/**单位*/
+	@Excel(name = "单位", width = 15)
+	@ApiModelProperty(value = "单位")
+    private java.lang.String rateunit;
+	/**费率有效期开始*/
+	@Excel(name = "费率有效期开始", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@ApiModelProperty(value = "费率有效期开始")
+    private java.util.Date begintime;
+	/**费率有效期结束*/
+	@Excel(name = "费率有效期结束", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@ApiModelProperty(value = "费率有效期结束")
+    private java.util.Date endtime;
+	
+	@ExcelCollection(name="base_energy_rate_detail")
+	@ApiModelProperty(value = "base_energy_rate_detail")
+	private List<EnergyRateDetail> energyRateDetailList;
+	
+}

module_base/src/main/java/org/jeecg/modules/energyRateDetail/controller/EnergyRateDetailController.java

@@ -1,177 +0,0 @@
-package org.jeecg.modules.energyRateDetail.controller;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.energyRateDetail.entity.EnergyRateDetail;
-import org.jeecg.modules.energyRateDetail.service.IEnergyRateDetailService;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-import org.jeecg.common.system.base.controller.JeecgController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.aspect.annotation.AutoLog;
-
- /**
- * @Description: 能源费率子表
- * @Author: jeecg-boot
- * @Date:   2024-01-23
- * @Version: V1.0
- */
-@Api(tags="能源费率子表")
-@RestController
-@RequestMapping("/energyRateDetail/energyRateDetail")
-@Slf4j
-public class EnergyRateDetailController extends JeecgController<EnergyRateDetail, IEnergyRateDetailService> {
-	@Autowired
-	private IEnergyRateDetailService energyRateDetailService;
-
-	/**
-	 * 分页列表查询
-	 *
-	 * @param energyRateDetail
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	//@AutoLog(value = "能源费率子表-分页列表查询")
-	@ApiOperation(value="能源费率子表-分页列表查询", notes="能源费率子表-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<IPage<EnergyRateDetail>> queryPageList(EnergyRateDetail energyRateDetail,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
-		QueryWrapper<EnergyRateDetail> queryWrapper = QueryGenerator.initQueryWrapper(energyRateDetail, req.getParameterMap());
-		Page<EnergyRateDetail> page = new Page<EnergyRateDetail>(pageNo, pageSize);
-		IPage<EnergyRateDetail> pageList = energyRateDetailService.page(page, queryWrapper);
-		return Result.OK(pageList);
-	}
-
-	/**
-	 *   添加
-	 *
-	 * @param energyRateDetail
-	 * @return
-	 */
-	@AutoLog(value = "能源费率子表-添加")
-	@ApiOperation(value="能源费率子表-添加", notes="能源费率子表-添加")
-	//@RequiresPermissions("org.jeecg.modules:base_energy_rate_detail:add")
-	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody EnergyRateDetail energyRateDetail) {
-		energyRateDetailService.save(energyRateDetail);
-		return Result.OK("添加成功！");
-	}
-
-	/**
-	 *  编辑
-	 *
-	 * @param energyRateDetail
-	 * @return
-	 */
-	@AutoLog(value = "能源费率子表-编辑")
-	@ApiOperation(value="能源费率子表-编辑", notes="能源费率子表-编辑")
-	//@RequiresPermissions("org.jeecg.modules:base_energy_rate_detail:edit")
-	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> edit(@RequestBody EnergyRateDetail energyRateDetail) {
-		energyRateDetailService.updateById(energyRateDetail);
-		return Result.OK("编辑成功!");
-	}
-
-	/**
-	 *   通过id删除
-	 *
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "能源费率子表-通过id删除")
-	@ApiOperation(value="能源费率子表-通过id删除", notes="能源费率子表-通过id删除")
-	//@RequiresPermissions("org.jeecg.modules:base_energy_rate_detail:delete")
-	@DeleteMapping(value = "/delete")
-	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
-		energyRateDetailService.removeById(id);
-		return Result.OK("删除成功!");
-	}
-
-	/**
-	 *  批量删除
-	 *
-	 * @param ids
-	 * @return
-	 */
-	@AutoLog(value = "能源费率子表-批量删除")
-	@ApiOperation(value="能源费率子表-批量删除", notes="能源费率子表-批量删除")
-	//@RequiresPermissions("org.jeecg.modules:base_energy_rate_detail:deleteBatch")
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		this.energyRateDetailService.removeByIds(Arrays.asList(ids.split(",")));
-		return Result.OK("批量删除成功!");
-	}
-
-	/**
-	 * 通过id查询
-	 *
-	 * @param id
-	 * @return
-	 */
-	//@AutoLog(value = "能源费率子表-通过id查询")
-	@ApiOperation(value="能源费率子表-通过id查询", notes="能源费率子表-通过id查询")
-	@GetMapping(value = "/queryById")
-	public Result<EnergyRateDetail> queryById(@RequestParam(name="id",required=true) String id) {
-		EnergyRateDetail energyRateDetail = energyRateDetailService.getById(id);
-		if(energyRateDetail==null) {
-			return Result.error("未找到对应数据");
-		}
-		return Result.OK(energyRateDetail);
-	}
-
-    /**
-    * 导出excel
-    *
-    * @param request
-    * @param energyRateDetail
-    */
-    //@RequiresPermissions("org.jeecg.modules:base_energy_rate_detail:exportXls")
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, EnergyRateDetail energyRateDetail) {
-        return super.exportXls(request, energyRateDetail, EnergyRateDetail.class, "能源费率子表");
-    }
-
-    /**
-      * 通过excel导入数据
-    *
-    * @param request
-    * @param response
-    * @return
-    */
-    //@RequiresPermissions("base_energy_rate_detail:importExcel")
-    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        return super.importExcel(request, response, EnergyRateDetail.class);
-    }
-
-}

module_base/src/main/java/org/jeecg/modules/energyRateDetail/mapper/EnergyRateDetailMapper.java

@@ -1,17 +0,0 @@
-package org.jeecg.modules.energyRateDetail.mapper;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.energyRateDetail.entity.EnergyRateDetail;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 能源费率子表
- * @Author: jeecg-boot
- * @Date:   2024-01-23
- * @Version: V1.0
- */
-public interface EnergyRateDetailMapper extends BaseMapper<EnergyRateDetail> {
-
-}

module_base/src/main/java/org/jeecg/modules/energyRateDetail/mapper/xml/EnergyRateDetailMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.energyRateDetail.mapper.EnergyRateDetailMapper">
-
-</mapper>

module_base/src/main/java/org/jeecg/modules/energyRateDetail/service/IEnergyRateDetailService.java

@@ -1,14 +0,0 @@
-package org.jeecg.modules.energyRateDetail.service;
-
-import org.jeecg.modules.energyRateDetail.entity.EnergyRateDetail;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 能源费率子表
- * @Author: jeecg-boot
- * @Date:   2024-01-23
- * @Version: V1.0
- */
-public interface IEnergyRateDetailService extends IService<EnergyRateDetail> {
-
-}

module_base/src/main/java/org/jeecg/modules/energyRateDetail/service/impl/EnergyRateDetailServiceImpl.java

@@ -1,19 +0,0 @@
-package org.jeecg.modules.energyRateDetail.service.impl;
-
-import org.jeecg.modules.energyRateDetail.entity.EnergyRateDetail;
-import org.jeecg.modules.energyRateDetail.mapper.EnergyRateDetailMapper;
-import org.jeecg.modules.energyRateDetail.service.IEnergyRateDetailService;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: 能源费率子表
- * @Author: jeecg-boot
- * @Date:   2024-01-23
- * @Version: V1.0
- */
-@Service
-public class EnergyRateDetailServiceImpl extends ServiceImpl<EnergyRateDetailMapper, EnergyRateDetail> implements IEnergyRateDetailService {
-
-}

module_base/src/main/java/org/jeecg/modules/energyType/controller/EnergyTypeController.java

@@ -78,7 +78,7 @@ public class EnergyTypeController extends JeecgController<EnergyType, IEnergyTyp
 	 @GetMapping(value = "/types")
 	 public Result<List<EnergyType>> queryTypes() {
 		 LambdaQueryWrapper<EnergyType> wrapper = new LambdaQueryWrapper<>();
-		 wrapper.select(EnergyType::getEnergytypeid,EnergyType::getName);
+		 wrapper.select(EnergyType::getId,EnergyType::getName);
 		 List<EnergyType> list = energyTypeService.list(wrapper);
 		 return Result.OK(list);
 	 }