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

@@ -20,4 +20,6 @@ public interface BusinessConstant {
 
 
     String sumSuffix = "Sum";
     String sumSuffix = "Sum";
 
 
+    String dictText = "_dictText";
+
 }
 }

+package com.skua.modules.joinclass.controller;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSON;
+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.skua.common.constant.BusinessConstant;
+import com.skua.core.api.vo.Result;
+import com.skua.core.aspect.annotation.AutoLog;
+import com.skua.core.query.QueryGenerator;
+import com.skua.core.util.ConvertUtils;
+import com.skua.modules.biz.IBusinessService;
+import com.skua.modules.joinclass.entity.JoinClassInfo;
+import com.skua.modules.joinclass.service.IJoinClassInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+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.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 javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * <pre>
+ * 交接班信息
+ * </pre>
+ *
+ * @author 开发者姓名
+ * @version V0.1, 开发时间
+ */
+@Slf4j
+@Api(tags = "交接班信息 ")
+@RestController
+@RequestMapping("/joinclass/joinClassInfo")
+public class JoinClassInfoController {
+    @Autowired
+    private IJoinClassInfoService joinClassInfoService;
+    @Autowired
+    private IBusinessService businessService;
+
+    /**
+     * <pre>
+     * 	分页列表查询
+     * </pre>
+     *
+     * @param joinClassInfo
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     * @author 开发者姓名, 开发时间
+     * @Description: TODO(这里描述这个方法的需求变更情况)
+     */
+
+    @AutoLog(value = "交接班信息 -分页列表查询")
+    @ApiOperation(value = "交接班信息 -分页列表查询", notes = "交接班信息 -分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<Object> queryPageList(JoinClassInfo joinClassInfo,
+                                        @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                        @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                        @RequestParam(name = "startTime", defaultValue = "") String startTime,
+                                        @RequestParam(name = "endTime", defaultValue = "") String endTime,
+                                        HttpServletRequest req) {
+        Result<Object> result = new Result<>();
+        QueryWrapper<JoinClassInfo> queryWrapper = QueryGenerator.initQueryWrapper(joinClassInfo, req.getParameterMap());
+        queryWrapper.ge(StringUtils.isNotEmpty(startTime), "data_time", startTime)
+                .le(StringUtils.isNotEmpty(endTime), "data_time", endTime);
+        Page<JoinClassInfo> page = new Page<>(pageNo, pageSize);
+        IPage<JoinClassInfo> pageList = joinClassInfoService.page(page, queryWrapper);
+        // 翻译
+        Map<String, String> classTypeDictMap = businessService.dictMap("JoinClassInfo_class_type", null);
+        Map<String, String> sysUserDictMap = businessService.dictMap("sys_user", null);
+        // 封装结果集
+        IPage<Map<String, Object>> mapIPage = new Page<>(pageNo, pageSize);
+        mapIPage.setTotal(pageList.getTotal());
+        mapIPage.setRecords(pageList.getRecords().stream().map(item -> {
+            Map<String, Object> entityMap = BeanUtil.beanToMap(item);
+            entityMap.put("classType" + BusinessConstant.dictText, classTypeDictMap.get(item.getClassType()));
+            entityMap.put("onDutyUser" + BusinessConstant.dictText, sysUserDictMap.get(item.getOnDutyUser()));
+            entityMap.put("handOverUser" + BusinessConstant.dictText, sysUserDictMap.get(item.getHandOverUser()));
+            entityMap.put("takeOverUser" + BusinessConstant.dictText, sysUserDictMap.get(item.getTakeOverUser()));
+            return entityMap;
+        }).collect(Collectors.toList()));
+        result.setSuccess(true);
+        result.setResult(mapIPage);
+        return result;
+    }
+
+    /**
+     * <pre>
+     * 	添加
+     * </pre>
+     *
+     * @param joinClassInfo
+     * @return
+     * @author 开发者姓名, 开发时间
+     * @Description: TODO(这里描述这个方法的需求变更情况)
+     */
+    @AutoLog(value = "交接班信息 -添加")
+    @ApiOperation(value = "交接班信息 -添加", notes = "交接班信息 -添加")
+    @PostMapping(value = "/add")
+    public Result<JoinClassInfo> add(@RequestBody JoinClassInfo joinClassInfo) {
+        Result<JoinClassInfo> result = new Result<>();
+        try {
+            joinClassInfoService.save(joinClassInfo);
+            result.success("添加成功！");
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.error500("操作失败");
+        }
+        return result;
+    }
+
+    /**
+     * <pre>
+     * 	 编辑
+     * </pre>
+     *
+     * @param joinClassInfo
+     * @return
+     * @author 开发者姓名, 开发时间
+     * @Description: TODO(这里描述这个方法的需求变更情况)
+     */
+    @AutoLog(value = "交接班信息 -编辑")
+    @ApiOperation(value = "交接班信息 -编辑", notes = "交接班信息 -编辑")
+    @PutMapping(value = "/edit")
+    public Result<JoinClassInfo> edit(@RequestBody JoinClassInfo joinClassInfo) {
+        Result<JoinClassInfo> result = new Result<>();
+        JoinClassInfo joinClassInfoEntity = joinClassInfoService.getById(joinClassInfo.getId());
+        if (joinClassInfoEntity == null) {
+            result.error500("未找到对应实体");
+        } else {
+            boolean ok = joinClassInfoService.updateById(joinClassInfo);
+            //TODO 返回false说明什么？
+            if (ok) {
+                result.success("修改成功!");
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * <pre>
+     * 	 通过id删除
+     * </pre>
+     *
+     * @param id
+     * @return
+     * @author 开发者姓名, 开发时间
+     * @Description: TODO(这里描述这个方法的需求变更情况)
+     */
+    @AutoLog(value = "交接班信息 -通过id删除")
+    @ApiOperation(value = "交接班信息 -通过id删除", notes = "交接班信息 -通过id删除")
+    @DeleteMapping(value = "/delete")
+    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+        try {
+            joinClassInfoService.removeById(id);
+        } catch (Exception e) {
+            log.error("删除失败", e.getMessage());
+            return Result.error("删除失败!");
+        }
+        return Result.ok("删除成功!");
+    }
+
+    /**
+     * <pre>
+     * 	  批量删除
+     * </pre>
+     *
+     * @param ids
+     * @return
+     * @author 开发者姓名, 开发时间
+     * @Description: TODO(这里描述这个方法的需求变更情况)
+     */
+    @AutoLog(value = "交接班信息 -批量删除")
+    @ApiOperation(value = "交接班信息 -批量删除", notes = "交接班信息 -批量删除")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<JoinClassInfo> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        Result<JoinClassInfo> result = new Result<JoinClassInfo>();
+        if (ids == null || "".equals(ids.trim())) {
+            result.error500("参数不识别！");
+        } else {
+            this.joinClassInfoService.removeByIds(Arrays.asList(ids.split(",")));
+            result.success("删除成功!");
+        }
+        return result;
+    }
+
+    /**
+     * <pre>
+     * 	 通过id查询
+     * </pre>
+     *
+     * @param id
+     * @return
+     * @author 开发者姓名, 开发时间
+     * @Description: TODO(这里描述这个方法的需求变更情况)
+     */
+    @AutoLog(value = "交接班信息 -通过id查询")
+    @ApiOperation(value = "交接班信息 -通过id查询", notes = "交接班信息 -通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<JoinClassInfo> queryById(@RequestParam(name = "id", required = true) String id) {
+        Result<JoinClassInfo> result = new Result<JoinClassInfo>();
+        JoinClassInfo joinClassInfo = joinClassInfoService.getById(id);
+        if (joinClassInfo == null) {
+            result.error500("未找到对应实体");
+        } else {
+            result.setResult(joinClassInfo);
+            result.setSuccess(true);
+        }
+        return result;
+    }
+
+    /**
+     * <pre>
+     * 	 导出excel
+     * </pre>
+     *
+     * @param request
+     * @param response
+     * @return
+     * @author 开发者姓名, 开发时间
+     * @Description: TODO(这里描述这个方法的需求变更情况)
+     */
+
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+        // Step.1 组装查询条件
+        QueryWrapper<JoinClassInfo> queryWrapper = null;
+        try {
+            String paramsStr = request.getParameter("paramsStr");
+            if (ConvertUtils.isNotEmpty(paramsStr)) {
+                String deString = URLDecoder.decode(paramsStr, "UTF-8");
+                JoinClassInfo joinClassInfo = JSON.parseObject(deString, JoinClassInfo.class);
+                queryWrapper = QueryGenerator.initQueryWrapper(joinClassInfo, request.getParameterMap());
+            }
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+
+        //Step.2 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        List<JoinClassInfo> pageList = joinClassInfoService.list(queryWrapper);
+        //导出文件名称
+        mv.addObject(NormalExcelConstants.FILE_NAME, "交接班信息 列表");
+        mv.addObject(NormalExcelConstants.CLASS, JoinClassInfo.class);
+        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("交接班信息 列表数据", "导出人:Jeecg", "导出信息"));
+        mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+        return mv;
+    }
+
+    /**
+     * <pre>
+     * 	 通过excel导入数据
+     * </pre>
+     *
+     * @param request
+     * @param response
+     * @return
+     * @author 开发者姓名, 开发时间
+     * @Description: TODO(这里描述这个方法的需求变更情况)
+     */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+            MultipartFile file = entity.getValue();// 获取上传文件对象
+            ImportParams params = new ImportParams();
+            params.setTitleRows(2);
+            params.setHeadRows(1);
+            params.setNeedSave(true);
+            try {
+                List<JoinClassInfo> listJoinClassInfos = ExcelImportUtil.importExcel(file.getInputStream(), JoinClassInfo.class, params);
+                joinClassInfoService.saveBatch(listJoinClassInfos);
+                return Result.ok("文件导入成功！数据行数:" + listJoinClassInfos.size());
+            } catch (Exception e) {
+                log.error(e.getMessage(), e);
+                return Result.error("文件导入失败:" + e.getMessage());
+            } finally {
+                try {
+                    file.getInputStream().close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return Result.ok("文件导入失败！");
+    }
+
+}

+package com.skua.modules.joinclass.entity;
+
+import java.util.Date;
+
+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 com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+/**
+ * 交接班信息
+ */
+@Data
+@TableName("join_class_info")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "join_class_info对象", description = "交接班信息 ")
+public class JoinClassInfo {
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.ID_WORKER_STR)
+    @ApiModelProperty(value = "主键")
+    private String id;
+    /**
+     * 值班人员
+     */
+    @Excel(name = "值班人员", width = 15)
+    @ApiModelProperty(value = "值班人员")
+    private String onDutyUser;
+    /**
+     * 时间
+     */
+    @Excel(name = "时间", width = 15)
+    @ApiModelProperty(value = "时间")
+    private String dataTime;
+    /**
+     * 班次类型(白班1;夜班2)
+     */
+    @Excel(name = "班次类型(白班1;夜班2)", width = 15)
+    @ApiModelProperty(value = "班次类型(白班1;夜班2)")
+    private String classType;
+    /**
+     * 值班记录
+     */
+    @Excel(name = "值班记录", width = 15)
+    @ApiModelProperty(value = "值班记录")
+    private String onDutyRecord;
+    /**
+     * 运行异常描述
+     */
+    @Excel(name = "运行异常描述", width = 15)
+    @ApiModelProperty(value = "运行异常描述")
+    private String runExceptionDesc;
+    /**
+     * 交接物品
+     */
+    @Excel(name = "交接物品", width = 15)
+    @ApiModelProperty(value = "交接物品")
+    private String handOverGoods;
+    /**
+     * 注意事项
+     */
+    @Excel(name = "注意事项", width = 15)
+    @ApiModelProperty(value = "注意事项")
+    private String attentionNote;
+    /**
+     * 交班人
+     */
+    @Excel(name = "交班人", width = 15)
+    @ApiModelProperty(value = "交班人")
+    private String handOverUser;
+    /**
+     * 接班人
+     */
+    @Excel(name = "接班人", width = 15)
+    @ApiModelProperty(value = "接班人")
+    private String takeOverUser;
+    /**
+     * 创建人
+     */
+    @Excel(name = "创建人", width = 15)
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+    /**
+     * 创建日期
+     */
+    @Excel(name = "创建日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private Date createTime;
+    /**
+     * 更新人
+     */
+    @Excel(name = "更新人", width = 15)
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+    /**
+     * 更新日期
+     */
+    @Excel(name = "更新日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private Date updateTime;
+    /**
+     * 排序字段
+     */
+    @Excel(name = "排序字段", width = 15)
+    @ApiModelProperty(value = "排序字段")
+    private Integer orderNum;
+    /**
+     * 删除状态(0正常;1已删除)
+     */
+    @Excel(name = "删除状态(0正常;1已删除)", width = 15)
+    @ApiModelProperty(value = "删除状态(0正常;1已删除)")
+    private String delFlag;
+
+}

+package com.skua.modules.joinclass.mapper;
+
+import com.skua.modules.joinclass.entity.JoinClassInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 交接班信息
+ */
+public interface JoinClassInfoMapper extends BaseMapper<JoinClassInfo> {
+
+}

+<?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.skua.modules.joinclass.mapper.JoinClassInfoMapper">
+
+</mapper>
\ No newline at end of file

+package com.skua.modules.joinclass.service;
+
+import com.skua.modules.joinclass.entity.JoinClassInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 交接班信息 
+ */
+public interface IJoinClassInfoService extends IService<JoinClassInfo> {
+
+}

+package com.skua.modules.joinclass.service.impl;
+
+import com.skua.modules.joinclass.entity.JoinClassInfo;
+import com.skua.modules.joinclass.mapper.JoinClassInfoMapper;
+import com.skua.modules.joinclass.service.IJoinClassInfoService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * 交接班信息
+ */
+@Service
+public class JoinClassInfoServiceImpl extends ServiceImpl<JoinClassInfoMapper, JoinClassInfo> implements IJoinClassInfoService {
+
+}