Merge branch 'bgy' of kn-cost/cost-backend into dev

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/BudgetPriceController.java

@@ -0,0 +1,180 @@
+package com.zzsmart.qomo.kn.cost.manage.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 com.zzsmart.qomo.kn.cost.manage.entity.BudgetPrice;
+import com.zzsmart.qomo.kn.cost.manage.service.IBudgetPriceService;
+
+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;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+
+ /**
+ * @Description: budget_price
+ * @Author: jeecg-boot
+ * @Date:   2024-06-11
+ * @Version: V1.0
+ */
+@Api(tags="budget_price")
+@RestController
+@RequestMapping("//budgetPrice")
+@Slf4j
+public class BudgetPriceController extends JeecgController<BudgetPrice, IBudgetPriceService> {
+	@Autowired
+	private IBudgetPriceService budgetPriceService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param budgetPrice
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "budget_price-分页列表查询")
+	@ApiOperation(value="budget_price-分页列表查询", notes="budget_price-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<BudgetPrice>> queryPageList(BudgetPrice budgetPrice,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<BudgetPrice> queryWrapper = QueryGenerator.initQueryWrapper(budgetPrice, req.getParameterMap());
+		Page<BudgetPrice> page = new Page<BudgetPrice>(pageNo, pageSize);
+		IPage<BudgetPrice> pageList = budgetPriceService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param budgetPrice
+	 * @return
+	 */
+	@AutoLog(value = "budget_price-添加")
+	@ApiOperation(value="budget_price-添加", notes="budget_price-添加")
+	//@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:budget_price:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody BudgetPrice budgetPrice) {
+		budgetPriceService.save(budgetPrice);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param budgetPrice
+	 * @return
+	 */
+	@AutoLog(value = "budget_price-编辑")
+	@ApiOperation(value="budget_price-编辑", notes="budget_price-编辑")
+	//@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:budget_price:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.POST})
+	public Result<String> edit(@RequestBody BudgetPrice budgetPrice) {
+		budgetPriceService.updateById(budgetPrice);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "budget_price-通过id删除")
+	@ApiOperation(value="budget_price-通过id删除", notes="budget_price-通过id删除")
+	//@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:budget_price:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		budgetPriceService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "budget_price-批量删除")
+	@ApiOperation(value="budget_price-批量删除", notes="budget_price-批量删除")
+	//@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:budget_price:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.budgetPriceService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "budget_price-通过id查询")
+	@ApiOperation(value="budget_price-通过id查询", notes="budget_price-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<BudgetPrice> queryById(@RequestParam(name="id",required=true) String id) {
+		BudgetPrice budgetPrice = budgetPriceService.getById(id);
+		if(budgetPrice==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(budgetPrice);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param budgetPrice
+    */
+    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:budget_price:exportXls")
+    @GetMapping(value = "/exportXls")
+	@ApiOperation(value="导出excel", notes="导出excel")
+    public ModelAndView exportXls(HttpServletRequest request, BudgetPrice budgetPrice) {
+        return super.exportXls(request, budgetPrice, BudgetPrice.class, "budget_price");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+	@ApiOperation(value="excel导入数据", notes="excel导入数据")
+	//@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:budget_price:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, BudgetPrice.class);
+    }
+
+}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/entity/BudgetPrice.java

@@ -0,0 +1,78 @@
+package com.zzsmart.qomo.kn.cost.manage.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @Description: budget_price
+ * @Author: jeecg-boot
+ * @Date: 2024-06-11
+ * @Version: V1.0
+ */
+@Data
+@TableName("budget_price")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "budget_price对象", description = "budget_price")
+public class BudgetPrice implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private Integer id;
+    /**
+     * 年份
+     */
+    @Excel(name = "年份", width = 15)
+    @ApiModelProperty(value = "年份")
+    private String year;
+    /**
+     * 物料编码
+     */
+    @Excel(name = "物料编码", width = 15)
+    @ApiModelProperty(value = "物料编码")
+    private String materialNumber;
+    /**
+     * 物料名称
+     */
+    @Excel(name = "物料名称", width = 15)
+    @ApiModelProperty(value = "物料名称")
+    private String materialName;
+    /**
+     * 项目编号
+     */
+    @Excel(name = "项目编号", width = 15)
+    @ApiModelProperty(value = "项目编号")
+    private String projectNumber;
+    /**
+     * 预算价格
+     */
+    @Excel(name = "预算价格", width = 15)
+    @ApiModelProperty(value = "预算价格")
+    private BigDecimal price;
+    /**
+     * dwerk
+     */
+    @Excel(name = "dwerk", width = 15)
+    @ApiModelProperty(value = "dwerk")
+    private String dwerk;
+    /**
+     * posid
+     */
+    @Excel(name = "posid", width = 15)
+    @ApiModelProperty(value = "posid")
+    private String posid;
+}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/BudgetPriceMapper.java

@@ -0,0 +1,14 @@
+package com.zzsmart.qomo.kn.cost.manage.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zzsmart.qomo.kn.cost.manage.entity.BudgetPrice;
+
+/**
+ * @Description: budget_price
+ * @Author: jeecg-boot
+ * @Date: 2024-06-11
+ * @Version: V1.0
+ */
+public interface BudgetPriceMapper extends BaseMapper<BudgetPrice> {
+
+}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/xml/BudgetPriceMapper.xml

@@ -0,0 +1,5 @@
+<?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="com.zzsmart.qomo.kn.cost.manage.mapper.BudgetPriceMapper">
+
+</mapper>

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/xml/HourRateMapper.xml

@@ -1,5 +1,5 @@
 <?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="com.zzsmart.qomo.modules.demo..mapper.HourRateMapper">
+<mapper namespace="com.zzsmart.qomo.kn.cost.manage.mapper.HourRateMapper">
 
 </mapper>

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/IBudgetPriceService.java

@@ -0,0 +1,14 @@
+package com.zzsmart.qomo.kn.cost.manage.service;
+
+import com.zzsmart.qomo.kn.cost.manage.entity.BudgetPrice;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: budget_price
+ * @Author: jeecg-boot
+ * @Date:   2024-06-11
+ * @Version: V1.0
+ */
+public interface IBudgetPriceService extends IService<BudgetPrice> {
+
+}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/impl/BudgetPriceServiceImpl.java

@@ -0,0 +1,18 @@
+package com.zzsmart.qomo.kn.cost.manage.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zzsmart.qomo.kn.cost.manage.entity.BudgetPrice;
+import com.zzsmart.qomo.kn.cost.manage.mapper.BudgetPriceMapper;
+import com.zzsmart.qomo.kn.cost.manage.service.IBudgetPriceService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description: budget_price
+ * @Author: jeecg-boot
+ * @Date: 2024-06-11
+ * @Version: V1.0
+ */
+@Service
+public class BudgetPriceServiceImpl extends ServiceImpl<BudgetPriceMapper, BudgetPrice> implements IBudgetPriceService {
+
+}