diff --git a/src/main/java/com/zhgd/xmgl/modules/helmet/service/impl/RundeGroupServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/helmet/service/impl/RundeGroupServiceImpl.java index 03fe07418..076e3b2c8 100644 --- a/src/main/java/com/zhgd/xmgl/modules/helmet/service/impl/RundeGroupServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/helmet/service/impl/RundeGroupServiceImpl.java @@ -32,6 +32,6 @@ public class RundeGroupServiceImpl extends ServiceImpl> queryPageList(SjImageProgress sjImageProgress, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + Result> result = new Result>(); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(sjImageProgress, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = sjImageProgressService.page(page, queryWrapper); + result.setSuccess(true); + result.setResult(pageList); + return result; + } + + /** + * 列表查询 + * + * @param sjImageProgress + * @param pageNo 页码 + * @param pageSize 条数 + * @param req + * @return + */ + @ApiOperation(value = " 列表查询三江形象进度信息", notes = "列表查询三江形象进度信息", httpMethod = "GET") + @GetMapping(value = "/list") + public Result> queryList(SjImageProgress sjImageProgress, + HttpServletRequest req) { + + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(sjImageProgress, req.getParameterMap()); + return Result.success(sjImageProgressService.list(queryWrapper)); + } + + /** + * 添加 + * + * @param sjImageProgress + * @return + */ + @ApiOperation(value = " 添加三江形象进度信息", notes = "添加三江形象进度信息", httpMethod = "POST") + @PostMapping(value = "/add") + public Result add(@RequestBody SjImageProgress sjImageProgress) { + Result result = new Result(); + try { + sjImageProgressService.save(sjImageProgress); + Result.success("添加成功！"); + } catch (Exception e) { + e.printStackTrace(); + log.info(e.getMessage()); + result.error500("操作失败"); + } + return result; + } + + /** + * 编辑 + * + * @param sjImageProgress + * @return + */ + @ApiOperation(value = "编辑三江形象进度信息", notes = "编辑三江形象进度信息", httpMethod = "POST") + @PostMapping(value = "/edit") + public Result edit(@RequestBody SjImageProgress sjImageProgress) { + Result result = new Result(); + SjImageProgress sjImageProgressEntity = sjImageProgressService.getById(sjImageProgress.getId()); + if (sjImageProgressEntity == null) { + result.error500("未找到对应实体"); + } else { + sjImageProgressService.updateById(sjImageProgress); + Result.success("修改成功!"); + } + + return result; + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @ApiOperation(value = "删除三江形象进度信息", notes = "删除三江形象进度信息", httpMethod = "POST") + @PostMapping(value = "/delete") + public Result delete(@RequestBody String id) { + JSONObject jsonObject = JSON.parseObject(id, JSONObject.class); + id = String.valueOf(jsonObject.get("id")); + Result result = new Result(); + SjImageProgress sjImageProgress = sjImageProgressService.getById(id); + if (sjImageProgress == null) { + result.error500("未找到对应实体"); + } else { + boolean ok = sjImageProgressService.removeById(id); + if (ok) { + Result.success("删除成功!"); + } + } + + return result; + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @ApiOperation(value = "批量删除三江形象进度信息", notes = "批量删除三江形象进度信息", httpMethod = "POST") + @ApiImplicitParam(name = "id", value = "三江形象进度ID字符串", paramType = "query", required = true, dataType = "String") + @PostMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { + Result result = new Result(); + if (ids == null || "".equals(ids.trim())) { + result.error500("参数不识别！"); + } else { + this.sjImageProgressService.removeByIds(Arrays.asList(ids.split(","))); + Result.success("删除成功!"); + } + return result; + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @ApiOperation(value = "通过id查询三江形象进度信息", notes = "通过id查询三江形象进度信息", httpMethod = "GET") + @ApiImplicitParam(name = "id", value = "三江形象进度ID", paramType = "query", required = true, dataType = "Integer") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name = "id", required = true) String id) { + Result result = new Result(); + SjImageProgress sjImageProgress = sjImageProgressService.getById(id); + if (sjImageProgress == null) { + result.error500("未找到对应实体"); + } else { + result.setResult(sjImageProgress); + result.setSuccess(true); + } + return result; + } + + /** + * 导出excel + * + * @param request + * @param response + */ + @ApiOperation(value = "导出excel三江形象进度信息", notes = "导出excel三江形象进度信息", httpMethod = "POST") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) { + // Step.1 组装查询条件 + QueryWrapper queryWrapper = null; + try { + String paramsStr = request.getParameter("paramsStr"); + if (oConvertUtils.isNotEmpty(paramsStr)) { + String deString = URLDecoder.decode(paramsStr, "UTF-8"); + SjImageProgress sjImageProgress = JSON.parseObject(deString, SjImageProgress.class); + queryWrapper = QueryGenerator.initQueryWrapper(sjImageProgress, request.getParameterMap()); + } + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + + //Step.2 AutoPoi 导出Excel + ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); + List pageList = sjImageProgressService.list(queryWrapper); + //导出文件名称 + mv.addObject(NormalExcelConstants.FILE_NAME, "三江形象进度列表"); + mv.addObject(NormalExcelConstants.CLASS, SjImageProgress.class); + mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("三江形象进度列表数据", "导出人:Jeecg", "导出信息")); + mv.addObject(NormalExcelConstants.DATA_LIST, pageList); + return mv; + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @ApiOperation(value = "通过excel导入三江形象进度信息", notes = "通过excel导入三江形象进度信息", httpMethod = "POST") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; + Map fileMap = multipartRequest.getFileMap(); + for (Map.Entry entity : fileMap.entrySet()) { + MultipartFile file = entity.getValue();// 获取上传文件对象 + ImportParams params = new ImportParams(); + params.setTitleRows(2); + params.setHeadRows(1); + params.setNeedSave(true); + try { + List listsjImageProgressses = ExcelImportUtil.importExcel(file.getInputStream(), SjImageProgress.class, params); + for (SjImageProgress sjImageProgressExcel : listsjImageProgressses) { + sjImageProgressService.save(sjImageProgressExcel); + } + return Result.ok("文件导入成功！数据行数：" + listsjImageProgressses.size()); + } catch (Exception e) { + log.error(e.getMessage()); + return Result.error("文件导入失败！"); + } finally { + try { + file.getInputStream().close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + return Result.ok("文件导入失败！"); + } + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/sanjiang/entity/SjImageProgress.java b/src/main/java/com/zhgd/xmgl/modules/sanjiang/entity/SjImageProgress.java new file mode 100644 index 000000000..9123c7dfe --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/sanjiang/entity/SjImageProgress.java @@ -0,0 +1,117 @@ +package com.zhgd.xmgl.modules.sanjiang.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 org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; + +/** + * @Description: 三江形象进度 + * @author： pds + * @date： 2023-04-12 + * @version： V1.0 + */ +@Data +@TableName("sj_image_progress") +@ApiModel(value = "sjImageProgress实体类", description = "SjImageProgress") +public class SjImageProgress implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键id") + private java.lang.Long id; + /** + * 经办人 + */ + @Excel(name = "经办人", width = 15) + @ApiModelProperty(value = "经办人") + private java.lang.String operator; + /** + * 经办时间 + */ + @Excel(name = "经办时间", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "经办时间") + private java.util.Date processingTime; + /** + * 上报单位 + */ + @Excel(name = "上报单位", width = 15) + @ApiModelProperty(value = "上报单位") + private java.lang.String reportingUnit; + /** + * 项目编号 + */ + @Excel(name = "项目编号", width = 15) + @ApiModelProperty(value = "项目编号") + private java.lang.String projectNumber; + /** + * 项目进度 + */ + @Excel(name = "项目进度", width = 15) + @ApiModelProperty(value = "项目进度") + private java.lang.Integer projectProgress; + /** + * 项目名称 + */ + @Excel(name = "项目名称", width = 15) + @ApiModelProperty(value = "项目名称") + private java.lang.String projectName; + /** + * 当前形象进度 + */ + @Excel(name = "当前形象进度", width = 15) + @ApiModelProperty(value = "当前形象进度") + private java.lang.String currentImageProgress; + /** + * 存在主要困难和问题 + */ + @Excel(name = "存在主要困难和问题", width = 15) + @ApiModelProperty(value = "存在主要困难和问题") + private java.lang.String majorDifficultyAndProblem; + /** + * 需协调解决主要事项 + */ + @Excel(name = "需协调解决主要事项", width = 15) + @ApiModelProperty(value = "需协调解决主要事项") + private java.lang.String majorMatter; + /** + * 附件url（多个，分隔） + */ + @Excel(name = "附件url（多个，分隔）", width = 15) + @ApiModelProperty(value = "附件url（多个，分隔）") + private java.lang.String attachmentUrl; + /** + * 项目sn + */ + @Excel(name = "项目sn", width = 15) + @ApiModelProperty(value = "项目sn") + private java.lang.String projectSn; + /** + * 创建时间 + */ + @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 java.util.Date createTime; + /** + * 更新时间 + */ + @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 java.util.Date updateTime; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/sanjiang/mapper/SjImageProgressMapper.java b/src/main/java/com/zhgd/xmgl/modules/sanjiang/mapper/SjImageProgressMapper.java new file mode 100644 index 000000000..2501f3a49 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/sanjiang/mapper/SjImageProgressMapper.java @@ -0,0 +1,16 @@ +package com.zhgd.xmgl.modules.sanjiang.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zhgd.xmgl.modules.sanjiang.entity.SjImageProgress; +import org.apache.ibatis.annotations.Mapper; + +/** + * @Description: 三江形象进度 + * @author： pds + * @date： 2023-04-12 + * @version： V1.0 + */ +@Mapper +public interface SjImageProgressMapper extends BaseMapper { + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/sanjiang/mapper/xml/SjImageProgressMapper.xml b/src/main/java/com/zhgd/xmgl/modules/sanjiang/mapper/xml/SjImageProgressMapper.xml new file mode 100644 index 000000000..3d5886b3c --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/sanjiang/mapper/xml/SjImageProgressMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/src/main/java/com/zhgd/xmgl/modules/sanjiang/service/ISjImageProgressService.java b/src/main/java/com/zhgd/xmgl/modules/sanjiang/service/ISjImageProgressService.java new file mode 100644 index 000000000..b5aef415a --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/sanjiang/service/ISjImageProgressService.java @@ -0,0 +1,14 @@ +package com.zhgd.xmgl.modules.sanjiang.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.zhgd.xmgl.modules.sanjiang.entity.SjImageProgress; + +/** + * @Description: 三江形象进度 + * @author： pds + * @date： 2023-04-12 + * @version： V1.0 + */ +public interface ISjImageProgressService extends IService { + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/sanjiang/service/impl/SjImageProgressServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/sanjiang/service/impl/SjImageProgressServiceImpl.java new file mode 100644 index 000000000..6f77bcba5 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/sanjiang/service/impl/SjImageProgressServiceImpl.java @@ -0,0 +1,18 @@ +package com.zhgd.xmgl.modules.sanjiang.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.zhgd.xmgl.modules.sanjiang.entity.SjImageProgress; +import com.zhgd.xmgl.modules.sanjiang.mapper.SjImageProgressMapper; +import com.zhgd.xmgl.modules.sanjiang.service.ISjImageProgressService; +import org.springframework.stereotype.Service; + +/** + * @Description: 三江形象进度 + * @author： pds + * @date： 2023-04-12 + * @version： V1.0 + */ +@Service +public class SjImageProgressServiceImpl extends ServiceImpl implements ISjImageProgressService { + +} diff --git a/src/main/resources/jeecg/jeecg_database.properties b/src/main/resources/jeecg/jeecg_database.properties index 81a9c0b9e..07e0efcde 100644 --- a/src/main/resources/jeecg/jeecg_database.properties +++ b/src/main/resources/jeecg/jeecg_database.properties @@ -1,11 +1,11 @@ -#mysql +#mysql diver_name=com.mysql.jdbc.Driver -url=jdbc:mysql://127.0.0.1:3306/wisdomsite?useUnicode=true&characterEncoding=UTF-8&useSSL=false +url=jdbc:mysql://127.0.0.1:3306/wisdomsite_sj?useUnicode=true&characterEncoding=UTF-8&useSSL=false #url=jdbc:mysql://127.0.0.1:3306/itbgp_bank?useUnicode=true&characterEncoding=UTF-8 #url=jdbc:mysql://139.9.66.234:3306/dev_manage?useUnicode=true&characterEncoding=UTF-8 username=root password=root -database_name=wisdomsite +database_name=wisdomsite_sj #database_name=dev_manage #oracle @@ -27,4 +27,4 @@ database_name=wisdomsite #url=jdbc:sqlserver://192.168.1.200:1433;DatabaseName=jeecg #username=sa #password=SA -#database_name=jeecg \ No newline at end of file +#database_name=jeecg