qushaowei
2023-10-08 ad4306e56798dc68d7c07faacbdfcd2be47a402b
班组
已添加6个文件
350 ■■■■■ 文件已修改
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/TeamController.java 179 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Team.java 116 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/TeamMapper.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/TeamMapper.xml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/ITeamService.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/TeamServiceImpl.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/TeamController.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,179 @@
package org.jeecg.modules.eam.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.eam.entity.Team;
import org.jeecg.modules.eam.service.ITeamService;
import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.service.ISysUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/**
 * @Description: mom_base_team
 * @Author: jeecg-boot
 * @Date:   2023-07-26
 * @Version: V1.0
 */
@Api(tags="mom_base_team")
@RestController
@RequestMapping("/base/team")
@Slf4j
public class TeamController extends JeecgController<Team, ITeamService> {
    @Autowired
    private ITeamService teamService;
    /**
     * åˆ†é¡µåˆ—表查询
     *
     * @param team
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    //@AutoLog(value = "mom_base_team-分页列表查询")
    @ApiOperation(value="mom_base_team-分页列表查询", notes="mom_base_team-分页列表查询")
    @GetMapping(value = "/list")
    public Result<IPage<Team>> queryPageList(Team team,
                                   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                   HttpServletRequest req) {
        QueryWrapper<Team> queryWrapper = QueryGenerator.initQueryWrapper(team, req.getParameterMap());
        Page<Team> page = new Page<Team>(pageNo, pageSize);
        IPage<Team> pageList = teamService.page(page, queryWrapper);
        return Result.OK(pageList);
    }
    /**
     *   æ·»åŠ 
     *
     * @param team
     * @return
     */
    @AutoLog(value = "mom_base_team-添加")
    @ApiOperation(value="mom_base_team-添加", notes="mom_base_team-添加")
    //@RequiresPermissions("org.jeecg.modules:mom_base_team:add")
    @PostMapping(value = "/add")
    public Result<String> add(@RequestBody Team team) {
        teamService.save(team);
        return Result.OK("添加成功!");
    }
    /**
     *  ç¼–辑
     *
     * @param team
     * @return
     */
    @AutoLog(value = "mom_base_team-编辑")
    @ApiOperation(value="mom_base_team-编辑", notes="mom_base_team-编辑")
    //@RequiresPermissions("org.jeecg.modules:mom_base_team:edit")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
    public Result<String> edit(@RequestBody Team team) {
        teamService.updateById(team);
        return Result.OK("编辑成功!");
    }
    /**
     *   é€šè¿‡id删除
     *
     * @param id
     * @return
     */
    @AutoLog(value = "mom_base_team-通过id删除")
    @ApiOperation(value="mom_base_team-通过id删除", notes="mom_base_team-通过id删除")
    //@RequiresPermissions("org.jeecg.modules:mom_base_team:delete")
    @DeleteMapping(value = "/delete")
    public Result<String> delete(@RequestParam(name="id",required=true) String id) {
        teamService.removeById(id);
        return Result.OK("删除成功!");
    }
    /**
     *  æ‰¹é‡åˆ é™¤
     *
     * @param ids
     * @return
     */
    @AutoLog(value = "mom_base_team-批量删除")
    @ApiOperation(value="mom_base_team-批量删除", notes="mom_base_team-批量删除")
    //@RequiresPermissions("org.jeecg.modules:mom_base_team:deleteBatch")
    @DeleteMapping(value = "/deleteBatch")
    public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
        this.teamService.removeByIds(Arrays.asList(ids.split(",")));
        return Result.OK("批量删除成功!");
    }
    /**
     * é€šè¿‡id查询
     *
     * @param id
     * @return
     */
    //@AutoLog(value = "mom_base_team-通过id查询")
    @ApiOperation(value="mom_base_team-通过id查询", notes="mom_base_team-通过id查询")
    @GetMapping(value = "/queryById")
    public Result<Team> queryById(@RequestParam(name="id",required=true) String id) {
        Team team = teamService.getById(id);
        if(team==null) {
            return Result.error("未找到对应数据");
        }
        return Result.OK(team);
    }
    /**
    * å¯¼å‡ºexcel
    *
    * @param request
    * @param team
    */
    //@RequiresPermissions("org.jeecg.modules:mom_base_team:exportXls")
    @RequestMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, Team team) {
        return super.exportXls(request, team, Team.class, "mom_base_team");
    }
    /**
      * é€šè¿‡excel导入数据
    *
    * @param request
    * @param response
    * @return
    */
    //@RequiresPermissions("mom_base_team:importExcel")
    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
        return super.importExcel(request, response, Team.class);
    }
    /**
     * æŸ¥è¯¢ç­ç»„列表
     *
     * @return
     */
    @GetMapping(value = "/queryTeamList")
    public Result<List<Team>> queryTeamList() {
        List<Team> teamList = teamService.lambdaQuery().eq(Team::getDelFlag,CommonConstant.DEL_FLAG_0).list();
        return Result.OK(teamList);
    }
}
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Team.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,116 @@
package org.jeecg.modules.eam.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 lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.jeecg.common.constant.CommonConstant;
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: mom_base_team
 * @Author: jeecg-boot
 * @Date:   2023-07-26
 * @Version: V1.0
 */
@Data
@TableName("mom_base_team")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="班组", description="班组")
public class Team implements Serializable {
    private static final long serialVersionUID = 1L;
    /**主键ID*/
    @TableId(type = IdType.ASSIGN_ID)
    @ApiModelProperty(value = "主键ID")
    private String id;
    /**班组编号*/
    @Excel(name = "班组编号", width = 15)
    @ApiModelProperty(value = "班组编号")
    private String num;
    /**班组名称*/
    @Excel(name = "班组名称", width = 15)
    @ApiModelProperty(value = "班组名称")
    private String name;
    /**工作中心ID*/
    @Excel(name = "工作中心ID", width = 15)
    @ApiModelProperty(value = "工作中心ID")
    private String workCenterId;
    /**工厂  */
    @Excel(name = "工厂  ", width = 15)
    @ApiModelProperty(value = "工厂  ")
    private String siteId;
    /**车间*/
    @Excel(name = "车间", width = 15)
    @ApiModelProperty(value = "车间")
    private String areaId;
    /**产线*/
    @Excel(name = "产线", width = 15)
    @ApiModelProperty(value = "产线")
    private String productionLineId;
    /**备注*/
    @Excel(name = "备注", width = 15)
    @ApiModelProperty(value = "备注")
    private String remark;
    /**状态 0 ç¦ç”¨ 1 å¯ç”¨*/
    @Excel(name = "状态 0 ç¦ç”¨ 1 å¯ç”¨", width = 15)
    @ApiModelProperty(value = "状态 0 ç¦ç”¨ 1 å¯ç”¨")
    private String status = CommonConstant.STATUS_1;
    /**创建人*/
    @ApiModelProperty(value = "创建人")
    private String createBy;
    /**创建时间*/
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern="yyyy-MM-dd")
    @ApiModelProperty(value = "创建时间")
    private Date createTime;
    /**更新人*/
    @ApiModelProperty(value = "更新人")
    private String updateBy;
    /**更新时间*/
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern="yyyy-MM-dd")
    @ApiModelProperty(value = "更新时间")
    private Date updateTime;
    /**租户ID*/
    @Excel(name = "租户ID", width = 15)
    @ApiModelProperty(value = "租户ID")
    private String tenantId;
    /**删除状态(0-正常,1-已删除)*/
    @Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
    @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
    private Integer delFlag = CommonConstant.DEL_FLAG_0;
    /**班组类型(1调试2生产)*/
    @Excel(name = "班组类型(1调试2生产)", width = 15)
    @ApiModelProperty(value = "班组类型(1调试2生产)")
    private Integer type;
    /**班制*/
    @Excel(name = "班制", width = 15)
    @ApiModelProperty(value = "班制")
    @Dict(dicCode = "team_system")
    private String teamSystem;
    /**轮换方式*/
    @Excel(name = "轮换方式", width = 15)
    @ApiModelProperty(value = "轮换方式")
    @Dict(dicCode = "rotation_method")
    private String rotationMethod;
    /**所属部门*/
    @Excel(name = "所属部门", width = 15)
    @ApiModelProperty(value = "所属部门")
    private String departId;
}
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/TeamMapper.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
package org.jeecg.modules.eam.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.eam.entity.Team;
/**
 * @Description: mom_base_team
 * @Author: jeecg-boot
 * @Date:   2023-07-26
 * @Version: V1.0
 */
public interface TeamMapper extends BaseMapper<Team> {
}
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/TeamMapper.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.eam.mapper.TeamMapper">
</mapper>
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/ITeamService.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,14 @@
package org.jeecg.modules.eam.service;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.eam.entity.Team;
/**
 * @Description: mom_base_team
 * @Author: jeecg-boot
 * @Date:   2023-07-26
 * @Version: V1.0
 */
public interface ITeamService extends IService<Team> {
}
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/TeamServiceImpl.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
package org.jeecg.modules.eam.service.impl;
import org.jeecg.modules.eam.entity.Team;
import org.jeecg.modules.eam.mapper.TeamMapper;
import org.jeecg.modules.eam.service.ITeamService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
 * @Description: mom_base_team
 * @Author: jeecg-boot
 * @Date:   2023-07-26
 * @Version: V1.0
 */
@Service
public class TeamServiceImpl extends ServiceImpl<TeamMapper, Team> implements ITeamService {
}