自定义列

module_kzks/src/main/java/org/jeecg/modules/customColumns/controller/CustomColumnsController.java

@@ -0,0 +1,227 @@
+package org.jeecg.modules.customColumns.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 com.baomidou.mybatisplus.core.conditions.Wrapper;
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.customColumns.convert.CustomColumnsConvert;
+import org.jeecg.modules.customColumns.dto.CustomColumnsEditDTO;
+import org.jeecg.modules.customColumns.entity.CustomColumns;
+import org.jeecg.modules.customColumns.service.ICustomColumnsService;
+
+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:   2023-08-14
+ * @Version: V1.0
+ */
+@Api(tags="自定义列记录表")
+@RestController
+@RequestMapping("/customColumns/customColumns")
+@Slf4j
+public class CustomColumnsController extends JeecgController<CustomColumns, ICustomColumnsService> {
+	@Autowired
+	private ICustomColumnsService customColumnsService;
+
+
+	 @ApiOperation("查询")
+	 @GetMapping("/select")
+	 public String[] select(){
+
+		 LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		 String userName=user.getUsername();// 登录账号
+
+		 CustomColumns customColumns = new CustomColumns();
+		 customColumns.setUserName(userName);
+		 customColumns.setCustomLocation("1");//TODO 暂时只有一个项目成本需要自定义列，如果以后有多个再改
+
+		 Wrapper<CustomColumns> queryWrapper = new QueryWrapper<>(customColumns);
+		 CustomColumns customColumns1 = customColumnsService.getOne(queryWrapper);
+
+		 String checkedValues = customColumns1.getCheckedValues();
+		 String[] checkedValue = checkedValues.split(",");
+
+		 return checkedValue;
+	 }
+
+	 @ApiOperation("修改")
+	 @RequestMapping(value = "/update", method = {RequestMethod.PUT,RequestMethod.POST})
+	 public void  update(@RequestBody CustomColumnsEditDTO dto){
+		 String[] checkedValues = dto.getCheckedValues();
+		 List<String> valuesList = Arrays.asList(checkedValues);
+		 String values = valuesList.stream().collect(Collectors.joining(","));
+
+		 LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		 String userName=user.getUsername();// 登录账号
+
+		 //TODO 暂时只有一个项目成本需要自定义列，如果以后有多个再改
+		 CustomColumns customColumns = CustomColumnsConvert.INSTANCE.convert("1",userName) ;
+
+		 Wrapper<CustomColumns> queryWrapper = new QueryWrapper<>(customColumns);
+		 CustomColumns customColumns1 = customColumnsService.getOne(queryWrapper);
+
+		 customColumns.setId(customColumns1.getId());
+		 customColumns.setCheckedValues(values);
+
+		 customColumnsService.updateById(customColumns);
+	 }
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param customColumns
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "自定义列记录表-分页列表查询")
+	@ApiOperation(value="自定义列记录表-分页列表查询", notes="自定义列记录表-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<CustomColumns>> queryPageList(CustomColumns customColumns,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<CustomColumns> queryWrapper = QueryGenerator.initQueryWrapper(customColumns, req.getParameterMap());
+		Page<CustomColumns> page = new Page<CustomColumns>(pageNo, pageSize);
+		IPage<CustomColumns> pageList = customColumnsService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param customColumns
+	 * @return
+	 */
+	@AutoLog(value = "自定义列记录表-添加")
+	@ApiOperation(value="自定义列记录表-添加", notes="自定义列记录表-添加")
+	//@RequiresPermissions("org.jeecg.modules:kzks_custom_columns:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody CustomColumns customColumns) {
+		customColumnsService.save(customColumns);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param customColumns
+	 * @return
+	 */
+	@AutoLog(value = "自定义列记录表-编辑")
+	@ApiOperation(value="自定义列记录表-编辑", notes="自定义列记录表-编辑")
+	//@RequiresPermissions("org.jeecg.modules:kzks_custom_columns:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody CustomColumns customColumns) {
+		customColumnsService.updateById(customColumns);
+		return Result.OK("编辑成功!");
+	}
+
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "自定义列记录表-通过id删除")
+	@ApiOperation(value="自定义列记录表-通过id删除", notes="自定义列记录表-通过id删除")
+	//@RequiresPermissions("org.jeecg.modules:kzks_custom_columns:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		customColumnsService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "自定义列记录表-批量删除")
+	@ApiOperation(value="自定义列记录表-批量删除", notes="自定义列记录表-批量删除")
+	//@RequiresPermissions("org.jeecg.modules:kzks_custom_columns:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.customColumnsService.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<CustomColumns> queryById(@RequestParam(name="id",required=true) String id) {
+		CustomColumns customColumns = customColumnsService.getById(id);
+		if(customColumns==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(customColumns);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param customColumns
+    */
+    //@RequiresPermissions("org.jeecg.modules:kzks_custom_columns:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, CustomColumns customColumns) {
+        return super.exportXls(request, customColumns, CustomColumns.class, "自定义列记录表");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("kzks_custom_columns:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, CustomColumns.class);
+    }
+
+}

module_kzks/src/main/java/org/jeecg/modules/customColumns/convert/CustomColumnsConvert.java

@@ -0,0 +1,24 @@
+package org.jeecg.modules.customColumns.convert;
+
+
+
+import org.jeecg.modules.customColumns.dto.CustomColumnsEditDTO;
+import org.jeecg.modules.customColumns.entity.CustomColumns;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.ReportingPolicy;
+import org.mapstruct.factory.Mappers;
+import org.springframework.util.CollectionUtils;
+
+import java.util.stream.Collectors;
+
+@Mapper(unmappedTargetPolicy = ReportingPolicy.IGNORE,imports ={ CollectionUtils.class, Collectors.class})
+public interface CustomColumnsConvert {
+
+    CustomColumnsConvert INSTANCE = Mappers.getMapper(CustomColumnsConvert.class);
+
+    @Mapping(target ="userName",source ="userName")
+    @Mapping(target ="customLocation",source ="customLocation")
+    CustomColumns convert(String customLocation, String userName);
+
+}

module_kzks/src/main/java/org/jeecg/modules/customColumns/dto/CustomColumnsEditDTO.java

@@ -0,0 +1,21 @@
+package org.jeecg.modules.customColumns.dto;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+
+@Data
+@Accessors(chain = true)
+public class CustomColumnsEditDTO {
+
+    /**自定义列记录*/
+    @Excel(name = "自定义列记录", width = 15)
+    @ApiModelProperty(value = "自定义列记录")
+    private java.lang.String[] checkedValues;
+
+}

module_kzks/src/main/java/org/jeecg/modules/customColumns/entity/CustomColumns.java

@@ -0,0 +1,71 @@
+package org.jeecg.modules.customColumns.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 自定义列记录表
+ * @Author: jeecg-boot
+ * @Date:   2023-08-14
+ * @Version: V1.0
+ */
+@Data
+@TableName("kzks_custom_columns")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="kzks_custom_columns对象", description="自定义列记录表")
+public class CustomColumns implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**登录账号*/
+	@Excel(name = "登录账号", width = 15)
+    @ApiModelProperty(value = "登录账号")
+    private java.lang.String userName;
+	/**自定义列位置*/
+	@Excel(name = "自定义列位置", width = 15, dicCode = "custom_location")
+	@Dict(dicCode = "custom_location")
+    @ApiModelProperty(value = "自定义列位置")
+    private java.lang.String customLocation;
+	/**自定义列记录*/
+	@Excel(name = "自定义列记录", width = 15)
+    @ApiModelProperty(value = "自定义列记录")
+    private java.lang.String checkedValues;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+}

module_kzks/src/main/java/org/jeecg/modules/customColumns/mapper/CustomColumnsMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.customColumns.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.customColumns.entity.CustomColumns;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 自定义列记录表
+ * @Author: jeecg-boot
+ * @Date:   2023-08-14
+ * @Version: V1.0
+ */
+public interface CustomColumnsMapper extends BaseMapper<CustomColumns> {
+
+}

module_kzks/src/main/java/org/jeecg/modules/customColumns/mapper/xml/CustomColumnsMapper.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="org.jeecg.modules.customColumns.mapper.CustomColumnsMapper">
+
+</mapper>

module_kzks/src/main/java/org/jeecg/modules/customColumns/service/ICustomColumnsService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.customColumns.service;
+
+import org.jeecg.modules.customColumns.entity.CustomColumns;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 自定义列记录表
+ * @Author: jeecg-boot
+ * @Date:   2023-08-14
+ * @Version: V1.0
+ */
+public interface ICustomColumnsService extends IService<CustomColumns> {
+
+}

module_kzks/src/main/java/org/jeecg/modules/customColumns/service/impl/CustomColumnsServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.customColumns.service.impl;
+
+import org.jeecg.modules.customColumns.entity.CustomColumns;
+import org.jeecg.modules.customColumns.mapper.CustomColumnsMapper;
+import org.jeecg.modules.customColumns.service.ICustomColumnsService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 自定义列记录表
+ * @Author: jeecg-boot
+ * @Date:   2023-08-14
+ * @Version: V1.0
+ */
+@Service
+public class CustomColumnsServiceImpl extends ServiceImpl<CustomColumnsMapper, CustomColumns> implements ICustomColumnsService {
+
+}