Merge remote-tracking branch 'origin/dev_20230828_RXWIN' into dev_20230828_RXWIN

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java

@@ -0,0 +1,179 @@
+package com.jero.modules.project.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jero.common.api.vo.Result;
+import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.system.base.controller.JeroController;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.modules.project.entity.ProjectRxswinEO;
+import com.jero.modules.project.service.IProjectRxswinEOService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.List;
+
+
+ /**
+ * @Description: rxswin表
+ * @Author: jero-boot
+ * @Date:   2023-08-28
+ * @Version: V1.0
+ */
+@Api(tags="rxswin表")
+@RestController
+@RequestMapping("/project/projectRxswinEO")
+@Slf4j
+public class ProjectRxswinEOController extends JeroController<ProjectRxswinEO, IProjectRxswinEOService> {
+	@Autowired
+	private IProjectRxswinEOService projectRxswinEOService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param projectRxswinEO
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "rxswin表-分页列表查询")
+	@ApiOperation(value="rxswin表-分页列表查询", notes="rxswin表-分页列表查询")
+	@GetMapping(value = "/page")
+	public Result<?> queryPageList(ProjectRxswinEO projectRxswinEO,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<ProjectRxswinEO> queryWrapper = QueryGenerator.initQueryWrapper(projectRxswinEO, req.getParameterMap());
+		Page<ProjectRxswinEO> page = new Page<ProjectRxswinEO>(pageNo, pageSize);
+		IPage<ProjectRxswinEO> pageList = projectRxswinEOService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "rxswin表-列表查询")
+    @ApiOperation(value="rxswin表-列表查询", notes="rxswin表-列表查询")
+	@GetMapping(value = "/list")
+	public Result<List<ProjectRxswinEO>> queryList() {
+        List<ProjectRxswinEO> list = projectRxswinEOService.queryList();
+        return Result.OK(list);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param projectRxswinEO
+	 * @return
+	 */
+	@AutoLog(value = "rxswin表-添加")
+	@ApiOperation(value="rxswin表-添加", notes="rxswin表-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@Validated @RequestBody ProjectRxswinEO projectRxswinEO) {
+		projectRxswinEOService.add(projectRxswinEO);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param projectRxswinEO
+	 * @return
+	 */
+	@AutoLog(value = "rxswin表-编辑")
+	@ApiOperation(value="rxswin表-编辑", notes="rxswin表-编辑")
+	@PutMapping(value = "/edit")
+	public Result<?> edit(@Validated @RequestBody ProjectRxswinEO projectRxswinEO) {
+		projectRxswinEOService.editById(projectRxswinEO);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "rxswin表-通过id删除")
+	@ApiOperation(value="rxswin表-通过id删除", notes="rxswin表-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		projectRxswinEOService.deleteById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "rxswin表-批量删除")
+	@ApiOperation(value="rxswin表-批量删除", notes="rxswin表-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.projectRxswinEOService.deleteByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "rxswin表-通过id查询")
+	@ApiOperation(value="rxswin表-通过id查询", notes="rxswin表-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+		ProjectRxswinEO projectRxswinEO = projectRxswinEOService.queryById(id);
+		if(projectRxswinEO==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(projectRxswinEO);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param projectRxswinEO
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, ProjectRxswinEO projectRxswinEO) {
+        return super.exportXls(request, projectRxswinEO, ProjectRxswinEO.class, "rxswin表");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, ProjectRxswinEO.class);
+    }
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRxswinEO.java

@@ -0,0 +1,91 @@
+package com.jero.modules.project.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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 org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+
+
+/**
+ * @Description: rxswin表
+ * @Author: jero-boot
+ * @Date:   2023-08-28
+ * @Version: V1.0
+ */
+@Data
+@TableName("project_rxswin")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="project_rxswin对象", description="rxswin表")
+public class ProjectRxswinEO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+
+	/**创建人*/
+    @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;
+
+	/**项目id*/
+	@Excel(name = "项目id", width = 15)
+    @ApiModelProperty(value = "项目id")
+    private java.lang.String projectId;
+
+	/**文档库id（编号）*/
+	@Excel(name = "文档库id（编号）", width = 15)
+    @ApiModelProperty(value = "文档库id（编号）")
+    private java.lang.String documentId;
+
+	/**主题*/
+	@Excel(name = "主题", width = 15)
+    @ApiModelProperty(value = "主题")
+    private java.lang.String theme;
+
+	/**RXSWIN*/
+	@Excel(name = "RXSWIN", width = 15)
+    @ApiModelProperty(value = "RXSWIN")
+    private java.lang.String rxswin;
+
+	/**版本*/
+	@Excel(name = "版本", width = 15)
+    @ApiModelProperty(value = "版本")
+    private java.lang.String version;
+
+	/**状态（0->保存，1->提交）*/
+	@Excel(name = "状态（0->保存，1->提交）", width = 15)
+    @ApiModelProperty(value = "状态（0->保存，1->提交）")
+    private java.lang.String state;
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectRxswinEOMapper.java

@@ -0,0 +1,17 @@
+package com.jero.modules.project.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.jero.modules.project.entity.ProjectRxswinEO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: rxswin表
+ * @Author: jero-boot
+ * @Date:   2023-08-28
+ * @Version: V1.0
+ */
+public interface ProjectRxswinEOMapper extends BaseMapper<ProjectRxswinEO> {
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRxswinEOMapper.xml

@@ -0,0 +1,18 @@
+<?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.jero.modules.project.mapper.ProjectRxswinEOMapper">
+    <resultMap id="ProjectRxswinEOResultMap" type="com.jero.modules.project.entity.ProjectRxswinEO">
+        <id column="id" property="id" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="sys_org_code" property="sysOrgCode" />
+        <result column="project_id" property="projectId" />
+        <result column="document_id" property="documentId" />
+        <result column="theme" property="theme" />
+        <result column="rxswin" property="rxswin" />
+        <result column="version" property="version" />
+        <result column="state" property="state" />
+    </resultMap>
+</mapper>

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRxswinEOService.java

@@ -0,0 +1,62 @@
+package com.jero.modules.project.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jero.modules.project.entity.ProjectRxswinEO;
+
+import java.util.List;
+
+/**
+ * @Description: rxswin表
+ * @Author: jero-boot
+ * @Date:   2023-08-28
+ * @Version: V1.0
+ */
+public interface IProjectRxswinEOService extends IService<ProjectRxswinEO> {
+
+	/**
+	 * 保存
+	 *
+	 * @param projectRxswinEO
+	 * @return
+	 */
+    void add(ProjectRxswinEO projectRxswinEO);
+
+	/**
+	 * 更新
+	 *
+	 * @param projectRxswinEO
+	 * @return
+	 */
+    void editById(ProjectRxswinEO projectRxswinEO);
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+    void deleteById(String id);
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+    void deleteByIds(List<String> ids);
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+    ProjectRxswinEO queryById(String id);
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+    List<ProjectRxswinEO> queryList();
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java

@@ -0,0 +1,115 @@
+package com.jero.modules.project.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.common.exception.JeroBootException;
+import com.jero.common.system.vo.LoginUser;
+import com.jero.modules.project.entity.ProjectRxswinEO;
+import com.jero.modules.project.mapper.ProjectRxswinEOMapper;
+import com.jero.modules.project.service.IProjectRxswinEOService;
+import org.apache.shiro.SecurityUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Description: rxswin表
+ * @Author: jero-boot
+ * @Date:   2023-08-28
+ * @Version: V1.0
+ */
+@Service
+public class ProjectRxswinEOServiceImpl extends ServiceImpl<ProjectRxswinEOMapper, ProjectRxswinEO> implements IProjectRxswinEOService {
+
+	/**
+	 * 保存
+	 *
+	 * @param projectRxswinEO
+	 * @return
+	 */
+	@Override
+    public void add(ProjectRxswinEO projectRxswinEO) {
+		//判断主题是否已存在
+		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		LambdaQueryWrapper<ProjectRxswinEO> wrapper = new LambdaQueryWrapper<>();
+		wrapper.eq(ProjectRxswinEO::getCreateBy,currentUser.getUsername());
+		wrapper.eq(ProjectRxswinEO::getProjectId,projectRxswinEO.getProjectId());
+		wrapper.eq(ProjectRxswinEO::getTheme,projectRxswinEO.getTheme());
+		List<ProjectRxswinEO> rxswinEOList = this.list(wrapper);
+		if(!rxswinEOList.isEmpty()){
+			throw new JeroBootException("主题："+projectRxswinEO.getTheme()+"已存在，请重新添加");
+		}
+		Date now = new Date();
+        projectRxswinEO.setCreateTime(now);
+        projectRxswinEO.setUpdateTime(now);
+        save(projectRxswinEO);
+    }
+
+	/**
+	 * 更新
+	 *
+	 * @param projectRxswinEO
+	 * @return
+	 */
+	@Override
+    public void editById(ProjectRxswinEO projectRxswinEO) {
+		//判断主题是否存在
+		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		LambdaQueryWrapper<ProjectRxswinEO> wrapper  =new LambdaQueryWrapper<>();
+		wrapper.eq(ProjectRxswinEO::getCreateBy,currentUser.getUsername());
+		wrapper.eq(ProjectRxswinEO::getProjectId,projectRxswinEO.getProjectId());
+		wrapper.eq(ProjectRxswinEO::getTheme,projectRxswinEO.getTheme());
+		wrapper.ne(ProjectRxswinEO::getId,projectRxswinEO.getId());
+		List<ProjectRxswinEO> rxswinEOList = this.list(wrapper);
+		if(!rxswinEOList.isEmpty()){
+			throw new JeroBootException("主题："+projectRxswinEO.getTheme()+"已存在，请重新添加");
+		}
+    	Date now = new Date();
+        projectRxswinEO.setUpdateTime(now);
+    	saveOrUpdate(projectRxswinEO);
+    }
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+    public void deleteById(String id) {
+        removeById(id);
+    }
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@Override
+    public void deleteByIds(List<String> ids) {
+        removeByIds(ids);
+    }
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+    public ProjectRxswinEO queryById(String id) {
+        return getById(id);
+    }
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@Override
+    public List<ProjectRxswinEO> queryList() {
+        return list();
+    }
+}