diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/demoMetting/controller/DjDemoLifeMeetingController.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/demoMetting/controller/DjDemoLifeMeetingController.java deleted file mode 100644 index 16f9e23..0000000 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/demoMetting/controller/DjDemoLifeMeetingController.java +++ /dev/null @@ -1,184 +0,0 @@ -package org.jeecg.modules.demo.demoMetting.controller; - -import java.util.Arrays; -import java.util.HashMap; -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 org.jeecg.common.api.vo.Result; -import org.jeecg.common.system.query.QueryGenerator; -import org.jeecg.common.system.query.QueryRuleEnum; -import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.demo.demoMetting.entity.DjDemoLifeMeeting; -import org.jeecg.modules.demo.demoMetting.service.IDjDemoLifeMeetingService; - -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.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Operation; -import org.jeecg.common.aspect.annotation.AutoLog; -import org.apache.shiro.authz.annotation.RequiresPermissions; - /** - * @Description: 所领导板子民主生活会问题台账 - * @Author: jeecg-boot - * @Date: 2026-03-24 - * @Version: V1.0 - */ -@Tag(name="所领导板子民主生活会问题台账") -@RestController -@RequestMapping("/demoMetting/djDemoLifeMeeting") -@Slf4j -public class DjDemoLifeMeetingController extends JeecgController { - @Autowired - private IDjDemoLifeMeetingService djDemoLifeMeetingService; - - /** - * 分页列表查询 - * - * @param djDemoLifeMeeting - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @AutoLog(value = "所领导板子民主生活会问题台账-分页列表查询") - @Operation(summary="所领导板子民主生活会问题台账-分页列表查询") - @GetMapping(value = "/list") - public Result> queryPageList(DjDemoLifeMeeting djDemoLifeMeeting, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - - - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(djDemoLifeMeeting, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = djDemoLifeMeetingService.page(page, queryWrapper); - return Result.OK(pageList); - } - - /** - * 添加 - * - * @param djDemoLifeMeeting - * @return - */ - @AutoLog(value = "所领导板子民主生活会问题台账-添加") - @Operation(summary="所领导板子民主生活会问题台账-添加") - @RequiresPermissions("demoMetting:dj_demo_life_meeting:add") - @PostMapping(value = "/add") - public Result add(@RequestBody DjDemoLifeMeeting djDemoLifeMeeting) { - djDemoLifeMeetingService.save(djDemoLifeMeeting); - - return Result.OK("添加成功！"); - } - - /** - * 编辑 - * - * @param djDemoLifeMeeting - * @return - */ - @AutoLog(value = "所领导板子民主生活会问题台账-编辑") - @Operation(summary="所领导板子民主生活会问题台账-编辑") - @RequiresPermissions("demoMetting:dj_demo_life_meeting:edit") - @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) - public Result edit(@RequestBody DjDemoLifeMeeting djDemoLifeMeeting) { - djDemoLifeMeetingService.updateById(djDemoLifeMeeting); - return Result.OK("编辑成功!"); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @AutoLog(value = "所领导板子民主生活会问题台账-通过id删除") - @Operation(summary="所领导板子民主生活会问题台账-通过id删除") - @RequiresPermissions("demoMetting:dj_demo_life_meeting:delete") - @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { - djDemoLifeMeetingService.removeById(id); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @AutoLog(value = "所领导板子民主生活会问题台账-批量删除") - @Operation(summary="所领导板子民主生活会问题台账-批量删除") - @RequiresPermissions("demoMetting:dj_demo_life_meeting:deleteBatch") - @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.djDemoLifeMeetingService.removeByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功!"); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @AutoLog(value = "所领导板子民主生活会问题台账-通过id查询") - @Operation(summary="所领导板子民主生活会问题台账-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - DjDemoLifeMeeting djDemoLifeMeeting = djDemoLifeMeetingService.getById(id); - if(djDemoLifeMeeting==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(djDemoLifeMeeting); - } - - /** - * 导出excel - * - * @param request - * @param djDemoLifeMeeting - */ - @AutoLog(value = "所领导板子民主生活会问题台账-通过excel导出") - @RequiresPermissions("demoMetting:dj_demo_life_meeting:exportXls") - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, DjDemoLifeMeeting djDemoLifeMeeting) { - return super.exportXls(request, djDemoLifeMeeting, DjDemoLifeMeeting.class, "所领导板子民主生活会问题台账"); - } - - /** - * 通过excel导入数据 - * - * @param request - * @param response - * @return - */ - @AutoLog(value = "所领导板子民主生活会问题台账-通过excel导入") - @RequiresPermissions("demoMetting:dj_demo_life_meeting:importExcel") - @RequestMapping(value = "/importExcel", method = RequestMethod.POST) - public Result importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, DjDemoLifeMeeting.class); - } - -} diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/demoMetting/entity/DjDemoLifeMeeting.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/demoMetting/entity/DjDemoLifeMeeting.java deleted file mode 100644 index 5e07693..0000000 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/demoMetting/entity/DjDemoLifeMeeting.java +++ /dev/null @@ -1,114 +0,0 @@ -package org.jeecg.modules.demo.demoMetting.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 org.jeecg.common.constant.ProvinceCityArea; -import org.jeecg.common.util.SpringContextUtils; -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.v3.oas.annotations.media.Schema; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * @Description: 所领导板子民主生活会问题台账 - * @Author: jeecg-boot - * @Date: 2026-03-24 - * @Version: V1.0 - */ -@Data -@TableName("dj_demo_life_meeting") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@Schema(description="所领导板子民主生活会问题台账") -public class DjDemoLifeMeeting implements Serializable { - private static final long serialVersionUID = 1L; - - /**主键*/ - @TableId(type = IdType.ASSIGN_ID) - @Schema(description = "主键") - private java.lang.String id; - /**创建人*/ - @Schema(description = "创建人") - private java.lang.String createBy; - /**创建日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @Schema(description = "创建日期") - private java.util.Date createTime; - /**更新人*/ - @Schema(description = "更新人") - private java.lang.String updateBy; - /**更新日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @Schema(description = "更新日期") - private java.util.Date updateTime; - /**所属部门*/ - @Schema(description = "所属部门") - private java.lang.String sysOrgCode; - /**序号*/ - @Excel(name = "序号", width = 15) - @Schema(description = "序号") - private java.lang.Integer sortNo; - /**问题分类*/ - @Excel(name = "问题分类", width = 15) - @Schema(description = "问题分类") - private java.lang.Integer problemType; - /**问题清单*/ - @Excel(name = "问题清单", width = 15) - @Schema(description = "问题清单") - private java.lang.String problemList; - /**问题表现*/ - @Excel(name = "问题表现", width = 15) - @Schema(description = "问题表现") - private java.lang.String problemManifestation; - /**责任领导*/ - @Excel(name = "责任领导", width = 15) - @Schema(description = "责任领导") - private java.lang.String responsibleLeader; - /**责任部门*/ - @Excel(name = "责任部门", width = 15) - @Schema(description = "责任部门") - @Dict(dictTable ="sys_depart",dicText = "depart_name",dicCode = "id") - private java.lang.String responsibleDept; - /**整改措施*/ - @Excel(name = "整改措施", width = 15) - @Schema(description = "整改措施") - private java.lang.String rectificationMeasures; - /**完成时限*/ - @Excel(name = "完成时限", width = 15, format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") - @Schema(description = "完成时限") - private java.util.Date completionDeadline; - /**完成时间*/ - @Excel(name = "完成时间", width = 15, format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") - @Schema(description = "完成时间") - private java.util.Date completionDate; - /**输出成果*/ - @Excel(name = "输出成果", width = 15) - @Schema(description = "输出成果") - private java.lang.String outputResults; - /**完成情况*/ - @Excel(name = "完成情况", width = 15) - @Schema(description = "完成情况") - private java.lang.String completionStatus; - /**是否可发起(0不可发起，1可发起)*/ - @Excel(name = "是否可发起", width = 15) - @Dict(dicCode = "is_launchable") - private String isLaunchable; - @TableLogic(value = "0", delval = "1") - private int delFlag = 0; -} diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/demoMetting/mapper/DjDemoLifeMeetingMapper.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/demoMetting/mapper/DjDemoLifeMeetingMapper.java deleted file mode 100644 index 4f06700..0000000 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/demoMetting/mapper/DjDemoLifeMeetingMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.jeecg.modules.demo.demoMetting.mapper; - -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.demo.demoMetting.entity.DjDemoLifeMeeting; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @Description: 所领导板子民主生活会问题台账 - * @Author: jeecg-boot - * @Date: 2026-03-24 - * @Version: V1.0 - */ -public interface DjDemoLifeMeetingMapper extends BaseMapper { - -} diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/demoMetting/mapper/xml/DjDemoLifeMeetingMapper.xml b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/demoMetting/mapper/xml/DjDemoLifeMeetingMapper.xml deleted file mode 100644 index 432c353..0000000 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/demoMetting/mapper/xml/DjDemoLifeMeetingMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/demoMetting/service/IDjDemoLifeMeetingService.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/demoMetting/service/IDjDemoLifeMeetingService.java deleted file mode 100644 index 12cb9e3..0000000 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/demoMetting/service/IDjDemoLifeMeetingService.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.jeecg.modules.demo.demoMetting.service; - -import org.jeecg.modules.demo.demoMetting.entity.DjDemoLifeMeeting; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * @Description: 所领导板子民主生活会问题台账 - * @Author: jeecg-boot - * @Date: 2026-03-24 - * @Version: V1.0 - */ -public interface IDjDemoLifeMeetingService extends IService { - -} diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/demoMetting/service/impl/DjDemoLifeMeetingServiceImpl.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/demoMetting/service/impl/DjDemoLifeMeetingServiceImpl.java deleted file mode 100644 index 26241aa..0000000 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/demoMetting/service/impl/DjDemoLifeMeetingServiceImpl.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.jeecg.modules.demo.demoMetting.service.impl; - -import org.jeecg.modules.demo.demoMetting.entity.DjDemoLifeMeeting; -import org.jeecg.modules.demo.demoMetting.mapper.DjDemoLifeMeetingMapper; -import org.jeecg.modules.demo.demoMetting.service.IDjDemoLifeMeetingService; -import org.springframework.stereotype.Service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -/** - * @Description: 所领导板子民主生活会问题台账 - * @Author: jeecg-boot - * @Date: 2026-03-24 - * @Version: V1.0 - */ -@Service -public class DjDemoLifeMeetingServiceImpl extends ServiceImpl implements IDjDemoLifeMeetingService { - -} diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/peopleService/controller/DjPeopleServiceController.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/peopleService/controller/DjPeopleServiceController.java deleted file mode 100644 index c8d8d0f..0000000 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/peopleService/controller/DjPeopleServiceController.java +++ /dev/null @@ -1,184 +0,0 @@ -package org.jeecg.modules.demo.peopleService.controller; - -import java.util.Arrays; -import java.util.HashMap; -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 org.jeecg.common.api.vo.Result; -import org.jeecg.common.system.query.QueryGenerator; -import org.jeecg.common.system.query.QueryRuleEnum; -import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.demo.peopleService.entity.DjPeopleService; -import org.jeecg.modules.demo.peopleService.service.IDjPeopleServiceService; - -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.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Operation; -import org.jeecg.common.aspect.annotation.AutoLog; -import org.apache.shiro.authz.annotation.RequiresPermissions; - /** - * @Description: 我为群众办实事台账 - * @Author: jeecg-boot - * @Date: 2026-03-24 - * @Version: V1.0 - */ -@Tag(name="我为群众办实事台账") -@RestController -@RequestMapping("/peopleService/djPeopleService") -@Slf4j -public class DjPeopleServiceController extends JeecgController { - @Autowired - private IDjPeopleServiceService djPeopleServiceService; - - /** - * 分页列表查询 - * - * @param djPeopleService - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @AutoLog(value = "我为群众办实事台账-分页列表查询") - @Operation(summary="我为群众办实事台账-分页列表查询") - @GetMapping(value = "/list") - public Result> queryPageList(DjPeopleService djPeopleService, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - - - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(djPeopleService, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = djPeopleServiceService.page(page, queryWrapper); - return Result.OK(pageList); - } - - /** - * 添加 - * - * @param djPeopleService - * @return - */ - @AutoLog(value = "我为群众办实事台账-添加") - @Operation(summary="我为群众办实事台账-添加") - @RequiresPermissions("peopleService:dj_people_service:add") - @PostMapping(value = "/add") - public Result add(@RequestBody DjPeopleService djPeopleService) { - djPeopleServiceService.save(djPeopleService); - - return Result.OK("添加成功！"); - } - - /** - * 编辑 - * - * @param djPeopleService - * @return - */ - @AutoLog(value = "我为群众办实事台账-编辑") - @Operation(summary="我为群众办实事台账-编辑") - @RequiresPermissions("peopleService:dj_people_service:edit") - @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) - public Result edit(@RequestBody DjPeopleService djPeopleService) { - djPeopleServiceService.updateById(djPeopleService); - return Result.OK("编辑成功!"); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @AutoLog(value = "我为群众办实事台账-通过id删除") - @Operation(summary="我为群众办实事台账-通过id删除") - @RequiresPermissions("peopleService:dj_people_service:delete") - @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { - djPeopleServiceService.removeById(id); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @AutoLog(value = "我为群众办实事台账-批量删除") - @Operation(summary="我为群众办实事台账-批量删除") - @RequiresPermissions("peopleService:dj_people_service:deleteBatch") - @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.djPeopleServiceService.removeByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功!"); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @AutoLog(value = "我为群众办实事台账-通过id查询") - @Operation(summary="我为群众办实事台账-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - DjPeopleService djPeopleService = djPeopleServiceService.getById(id); - if(djPeopleService==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(djPeopleService); - } - - /** - * 导出excel - * - * @param request - * @param djPeopleService - */ - @AutoLog(value = "我为群众办实事台账-通过excel导出") - @RequiresPermissions("peopleService:dj_people_service:exportXls") - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, DjPeopleService djPeopleService) { - return super.exportXls(request, djPeopleService, DjPeopleService.class, "我为群众办实事台账"); - } - - /** - * 通过excel导入数据 - * - * @param request - * @param response - * @return - */ - @AutoLog(value = "我为群众办实事台账-通过excel导入") - @RequiresPermissions("peopleService:dj_people_service:importExcel") - @RequestMapping(value = "/importExcel", method = RequestMethod.POST) - public Result importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, DjPeopleService.class); - } - -} diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/peopleService/entity/DjPeopleService.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/peopleService/entity/DjPeopleService.java deleted file mode 100644 index d397cd6..0000000 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/peopleService/entity/DjPeopleService.java +++ /dev/null @@ -1,92 +0,0 @@ -package org.jeecg.modules.demo.peopleService.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 org.jeecg.common.constant.ProvinceCityArea; -import org.jeecg.common.util.SpringContextUtils; -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.v3.oas.annotations.media.Schema; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * @Description: 我为群众办实事台账 - * @Author: jeecg-boot - * @Date: 2026-03-24 - * @Version: V1.0 - */ -@Data -@TableName("dj_people_service") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@Schema(description="我为群众办实事台账") -public class DjPeopleService implements Serializable { - private static final long serialVersionUID = 1L; - - /**主键*/ - @TableId(type = IdType.ASSIGN_ID) - @Schema(description = "主键") - private java.lang.String id; - /**创建人*/ - @Schema(description = "创建人") - private java.lang.String createBy; - /**创建日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @Schema(description = "创建日期") - private java.util.Date createTime; - /**更新人*/ - @Schema(description = "更新人") - private java.lang.String updateBy; - /**更新日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @Schema(description = "更新日期") - private java.util.Date updateTime; - /**所属部门*/ - @Schema(description = "所属部门") - private java.lang.String sysOrgCode; - /**序号*/ - @Excel(name = "序号", width = 15) - @Schema(description = "序号") - private java.lang.Integer sortNo; - /**问题分类*/ - @Excel(name = "问题分类", width = 15) - @Schema(description = "问题分类") - private java.lang.String problemType; - /**具体措施*/ - @Excel(name = "具体措施", width = 15) - @Schema(description = "具体措施") - private java.lang.String specificMeasure; - /**完成时限*/ - @Excel(name = "完成时限", width = 15, format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") - @Schema(description = "完成时限") - private java.util.Date completionDeadline; - /**责任部门*/ - @Excel(name = "责任部门", width = 15) - @Schema(description = "责任部门") - @Dict(dictTable ="sys_depart",dicText = "depart_name",dicCode = "id") - private java.lang.String responsibleDept; - /**完成情况*/ - @Excel(name = "完成情况", width = 15) - @Schema(description = "完成情况") - private java.lang.String completionStatus; - /**是否可发起(0不可发起，1可发起)*/ - @Excel(name = "是否可发起", width = 15) - @Dict(dicCode = "is_launchable") - private String isLaunchable; - @TableLogic(value = "0", delval = "1") - private int delFlag = 0; -} diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/peopleService/mapper/DjPeopleServiceMapper.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/peopleService/mapper/DjPeopleServiceMapper.java deleted file mode 100644 index 61a41b7..0000000 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/peopleService/mapper/DjPeopleServiceMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.jeecg.modules.demo.peopleService.mapper; - -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.demo.peopleService.entity.DjPeopleService; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @Description: 我为群众办实事台账 - * @Author: jeecg-boot - * @Date: 2026-03-24 - * @Version: V1.0 - */ -public interface DjPeopleServiceMapper extends BaseMapper { - -} diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/peopleService/mapper/xml/DjPeopleServiceMapper.xml b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/peopleService/mapper/xml/DjPeopleServiceMapper.xml deleted file mode 100644 index 7b6cb99..0000000 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/peopleService/mapper/xml/DjPeopleServiceMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/peopleService/service/IDjPeopleServiceService.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/peopleService/service/IDjPeopleServiceService.java deleted file mode 100644 index e220f57..0000000 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/peopleService/service/IDjPeopleServiceService.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.jeecg.modules.demo.peopleService.service; - -import org.jeecg.modules.demo.peopleService.entity.DjPeopleService; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * @Description: 我为群众办实事台账 - * @Author: jeecg-boot - * @Date: 2026-03-24 - * @Version: V1.0 - */ -public interface IDjPeopleServiceService extends IService { - -} diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/peopleService/service/impl/DjPeopleServiceServiceImpl.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/peopleService/service/impl/DjPeopleServiceServiceImpl.java deleted file mode 100644 index d090aa9..0000000 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/peopleService/service/impl/DjPeopleServiceServiceImpl.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.jeecg.modules.demo.peopleService.service.impl; - -import org.jeecg.modules.demo.peopleService.entity.DjPeopleService; -import org.jeecg.modules.demo.peopleService.mapper.DjPeopleServiceMapper; -import org.jeecg.modules.demo.peopleService.service.IDjPeopleServiceService; -import org.springframework.stereotype.Service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -/** - * @Description: 我为群众办实事台账 - * @Author: jeecg-boot - * @Date: 2026-03-24 - * @Version: V1.0 - */ -@Service -public class DjPeopleServiceServiceImpl extends ServiceImpl implements IDjPeopleServiceService { - -} diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/rectifylist/controller/DjInspectionRectifyListController.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/rectifylist/controller/DjInspectionRectifyListController.java deleted file mode 100644 index db5a90e..0000000 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/rectifylist/controller/DjInspectionRectifyListController.java +++ /dev/null @@ -1,302 +0,0 @@ -package org.jeecg.modules.demo.rectifylist.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 org.jeecg.common.api.vo.Result; -import org.jeecg.common.system.query.QueryGenerator; -import org.jeecg.common.util.oConvertUtils; -import org.jeecg.common.system.vo.SelectTreeModel; -import org.jeecg.modules.demo.rectifylist.entity.DjInspectionRectifyList; -import org.jeecg.modules.demo.rectifylist.service.IDjInspectionRectifyListService; - -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.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Operation; -import org.jeecg.common.aspect.annotation.AutoLog; -import org.apache.shiro.authz.annotation.RequiresPermissions; - - /** - * @Description: 党建巡视整改提升工作台账 - * @Author: jeecg-boot - * @Date: 2026-03-24 - * @Version: V1.0 - */ -@Tag(name="党建巡视整改提升工作台账") -@RestController -@RequestMapping("/rectifylist/djInspectionRectifyList") -@Slf4j -public class DjInspectionRectifyListController extends JeecgController{ - @Autowired - private IDjInspectionRectifyListService djInspectionRectifyListService; - - /** - * 分页列表查询 - * - * @param djInspectionRectifyList - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @AutoLog(value = "党建巡视整改提升工作台账-分页列表查询") - @Operation(summary="党建巡视整改提升工作台账-分页列表查询") - @GetMapping(value = "/rootList") - public Result> queryPageList(DjInspectionRectifyList djInspectionRectifyList, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - String hasQuery = req.getParameter("hasQuery"); - if(hasQuery != null && "true".equals(hasQuery)){ - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(djInspectionRectifyList, req.getParameterMap()); - List list = djInspectionRectifyListService.queryTreeListNoPage(queryWrapper); - IPage pageList = new Page<>(1, 10, list.size()); - pageList.setRecords(list); - return Result.OK(pageList); - }else{ - String parentId = djInspectionRectifyList.getPid(); - if (oConvertUtils.isEmpty(parentId)) { - parentId = "0"; - } - djInspectionRectifyList.setPid(null); - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(djInspectionRectifyList, req.getParameterMap()); - // 使用 eq 防止模糊查询 - queryWrapper.eq("pid", parentId); - Page page = new Page(pageNo, pageSize); - IPage pageList = djInspectionRectifyListService.page(page, queryWrapper); - return Result.OK(pageList); - } - } - - /** - * 【vue3专用】加载节点的子数据 - * - * @param pid - * @return - */ - @AutoLog(value = "党建巡视整改提升工作台账-加载树子节点") - @RequestMapping(value = "/loadTreeChildren", method = RequestMethod.GET) - public Result> loadTreeChildren(@RequestParam(name = "pid") String pid) { - Result> result = new Result<>(); - try { - List ls = djInspectionRectifyListService.queryListByPid(pid); - result.setResult(ls); - result.setSuccess(true); - } catch (Exception e) { - e.printStackTrace(); - result.setMessage(e.getMessage()); - result.setSuccess(false); - } - return result; - } - - /** - * 【vue3专用】加载一级节点/如果是同步 则所有数据 - * - * @param async - * @param pcode - * @return - */ - @AutoLog(value = "党建巡视整改提升工作台账-加载树根节点") - @RequestMapping(value = "/loadTreeRoot", method = RequestMethod.GET) - public Result> loadTreeRoot(@RequestParam(name = "async") Boolean async, @RequestParam(name = "pcode") String pcode) { - Result> result = new Result<>(); - try { - List ls = djInspectionRectifyListService.queryListByCode(pcode); - if (!async) { - loadAllChildren(ls); - } - result.setResult(ls); - result.setSuccess(true); - } catch (Exception e) { - e.printStackTrace(); - result.setMessage(e.getMessage()); - result.setSuccess(false); - } - return result; - } - - /** - * 【vue3专用】递归求子节点 同步加载用到 - * - * @param ls - */ - private void loadAllChildren(List ls) { - for (SelectTreeModel tsm : ls) { - List temp = djInspectionRectifyListService.queryListByPid(tsm.getKey()); - if (temp != null && temp.size() > 0) { - tsm.setChildren(temp); - loadAllChildren(temp); - } - } - } - - /** - * 获取子数据 - * @param djInspectionRectifyList - * @param req - * @return - */ - @AutoLog(value = "党建巡视整改提升工作台账-获取子数据") - @Operation(summary="党建巡视整改提升工作台账-获取子数据") - @GetMapping(value = "/childList") - public Result> queryPageList(DjInspectionRectifyList djInspectionRectifyList,HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(djInspectionRectifyList, req.getParameterMap()); - List list = djInspectionRectifyListService.list(queryWrapper); - IPage pageList = new Page<>(1, 10, list.size()); - pageList.setRecords(list); - return Result.OK(pageList); - } - - /** - * 批量查询子节点 - * @param parentIds 父ID（多个采用半角逗号分割） - * @return 返回 IPage - * @param parentIds - * @return - */ - @AutoLog(value = "党建巡视整改提升工作台账-批量获取子数据") - @Operation(summary="党建巡视整改提升工作台账-批量获取子数据") - @GetMapping("/getChildListBatch") - public Result getChildListBatch(@RequestParam("parentIds") String parentIds) { - try { - QueryWrapper queryWrapper = new QueryWrapper<>(); - List parentIdList = Arrays.asList(parentIds.split(",")); - queryWrapper.in("pid", parentIdList); - List list = djInspectionRectifyListService.list(queryWrapper); - IPage pageList = new Page<>(1, 10, list.size()); - pageList.setRecords(list); - return Result.OK(pageList); - } catch (Exception e) { - log.error(e.getMessage(), e); - return Result.error("批量查询子节点失败：" + e.getMessage()); - } - } - - /** - * 添加 - * - * @param djInspectionRectifyList - * @return - */ - @AutoLog(value = "党建巡视整改提升工作台账-添加") - @Operation(summary="党建巡视整改提升工作台账-添加") - @RequiresPermissions("rectifylist:dj_inspection_rectify_list:add") - @PostMapping(value = "/add") - public Result add(@RequestBody DjInspectionRectifyList djInspectionRectifyList) { - djInspectionRectifyListService.addDjInspectionRectifyList(djInspectionRectifyList); - return Result.OK("添加成功！"); - } - - /** - * 编辑 - * - * @param djInspectionRectifyList - * @return - */ - @AutoLog(value = "党建巡视整改提升工作台账-编辑") - @Operation(summary="党建巡视整改提升工作台账-编辑") - @RequiresPermissions("rectifylist:dj_inspection_rectify_list:edit") - @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) - public Result edit(@RequestBody DjInspectionRectifyList djInspectionRectifyList) { - djInspectionRectifyListService.updateDjInspectionRectifyList(djInspectionRectifyList); - return Result.OK("编辑成功!"); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @AutoLog(value = "党建巡视整改提升工作台账-通过id删除") - @Operation(summary="党建巡视整改提升工作台账-通过id删除") - @RequiresPermissions("rectifylist:dj_inspection_rectify_list:delete") - @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { - djInspectionRectifyListService.deleteDjInspectionRectifyList(id); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @AutoLog(value = "党建巡视整改提升工作台账-批量删除") - @Operation(summary="党建巡视整改提升工作台账-批量删除") - @RequiresPermissions("rectifylist:dj_inspection_rectify_list:deleteBatch") - @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.djInspectionRectifyListService.removeByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功！"); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @AutoLog(value = "党建巡视整改提升工作台账-通过id查询") - @Operation(summary="党建巡视整改提升工作台账-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - DjInspectionRectifyList djInspectionRectifyList = djInspectionRectifyListService.getById(id); - if(djInspectionRectifyList==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(djInspectionRectifyList); - } - - /** - * 导出excel - * - * @param request - * @param djInspectionRectifyList - */ - @AutoLog(value = "党建巡视整改提升工作台账-通过excel导出") - @RequiresPermissions("rectifylist:dj_inspection_rectify_list:exportXls") - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, DjInspectionRectifyList djInspectionRectifyList) { - return super.exportXls(request, djInspectionRectifyList, DjInspectionRectifyList.class, "党建巡视整改提升工作台账"); - } - - /** - * 通过excel导入数据 - * - * @param request - * @param response - * @return - */ - @AutoLog(value = "党建巡视整改提升工作台账-通过excel导入") - @RequiresPermissions("rectifylist:dj_inspection_rectify_list:importExcel") - @RequestMapping(value = "/importExcel", method = RequestMethod.POST) - public Result importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, DjInspectionRectifyList.class); - } - -} diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/rectifylist/entity/DjInspectionRectifyList.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/rectifylist/entity/DjInspectionRectifyList.java deleted file mode 100644 index d4ba8de..0000000 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/rectifylist/entity/DjInspectionRectifyList.java +++ /dev/null @@ -1,126 +0,0 @@ -package org.jeecg.modules.demo.rectifylist.entity; - -import java.io.Serializable; -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 org.jeecg.common.constant.ProvinceCityArea; -import org.jeecg.common.util.SpringContextUtils; -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.v3.oas.annotations.media.Schema; -import java.io.UnsupportedEncodingException; - -/** - * @Description: 党建巡视整改提升工作台账 - * @Author: jeecg-boot - * @Date: 2026-03-24 - * @Version: V1.0 - */ -@Data -@TableName("dj_inspection_rectify_list") -@Schema(description="党建巡视整改提升工作台账") -public class DjInspectionRectifyList implements Serializable { - private static final long serialVersionUID = 1L; - - /**主键*/ - @TableId(type = IdType.ASSIGN_ID) - @Schema(description = "主键") - private java.lang.String id; - /**创建人*/ - @Schema(description = "创建人") - private java.lang.String createBy; - /**创建日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @Schema(description = "创建日期") - private java.util.Date createTime; - /**更新人*/ - @Schema(description = "更新人") - private java.lang.String updateBy; - /**更新日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @Schema(description = "更新日期") - private java.util.Date updateTime; - /**所属部门*/ - @Schema(description = "所属部门") - private java.lang.String sysOrgCode; - /**父级节点*/ - @Excel(name = "父级节点", width = 15) - @Schema(description = "父级节点") - private java.lang.String pid; - /**是否有子节点*/ - @Excel(name = "是否有子节点", width = 15, dicCode = "yn") - @Dict(dicCode = "yn") - @Schema(description = "是否有子节点") - private java.lang.String hasChild; - /**问题名称*/ - @Excel(name = "问题名称", width = 15) - @Schema(description = "问题名称") - private java.lang.String issueName; - /**问题分类*/ - @Excel(name = "问题分类", width = 15) - @Schema(description = "问题分类") - private java.lang.Integer problemType; - /**面上问题*/ - @Excel(name = "面上问题", width = 15) - @Schema(description = "面上问题") - private java.lang.String msIssue; - /**具体问题*/ - @Excel(name = "具体问题", width = 15) - @Schema(description = "具体问题") - private java.lang.String specificIssue; - /**整改措施*/ - @Excel(name = "整改措施", width = 15) - @Schema(description = "整改措施") - private java.lang.String rectificationMeasures; - /**完成时限*/ - @Excel(name = "完成时限", width = 15, format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") - @Schema(description = "完成时限") - private java.util.Date completionDeadline; - /**责任部门*/ - @Excel(name = "责任部门", width = 15) - @Schema(description = "责任部门") - @Dict(dictTable ="sys_depart",dicText = "depart_name",dicCode = "id") - private java.lang.String responsibleDept; - /**分管所领导*/ - @Excel(name = "分管所领导", width = 15) - @Schema(description = "分管所领导") - private java.lang.String supervisingLeader; - /**标志性成果*/ - @Excel(name = "标志性成果", width = 15) - @Schema(description = "标志性成果") - private java.lang.String landmarkAchievement; - /**完成时间*/ - @Excel(name = "完成时间", width = 15, format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") - @Schema(description = "完成时间") - private java.util.Date completionDate; - /**监督意见*/ - @Excel(name = "监督意见", width = 15) - @Schema(description = "监督意见") - private java.lang.String supervisionOpinion; - /**措施数量*/ - @Excel(name = "措施数量", width = 15) - @Schema(description = "措施数量") - private java.lang.Integer measureCount; - /**是否可发起(0不可发起，1可发起)*/ - @Excel(name = "是否可发起", width = 15) - @Dict(dicCode = "is_launchable") - private String isLaunchable; - @TableLogic(value = "0", delval = "1") - private int delFlag = 0; - // 该表单未设置逻辑删除功能，因为该表单为树形结构 - -} diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/rectifylist/mapper/DjInspectionRectifyListMapper.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/rectifylist/mapper/DjInspectionRectifyListMapper.java deleted file mode 100644 index 9258f0e..0000000 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/rectifylist/mapper/DjInspectionRectifyListMapper.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.jeecg.modules.demo.rectifylist.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Param; -import org.jeecg.common.system.vo.SelectTreeModel; -import org.jeecg.modules.demo.rectifylist.entity.DjInspectionRectifyList; - -import java.util.List; -import java.util.Map; - -/** - * @Description: 党建巡视整改提升工作台账 - * @Author: jeecg-boot - * @Date: 2026-03-24 - * @Version: V1.0 - */ -public interface DjInspectionRectifyListMapper extends BaseMapper { - - /** - * 编辑节点状态 - * @param id - * @param status - */ - void updateTreeNodeStatus(@Param("id") String id,@Param("status") String status); - - /** - * 【vue3专用】根据父级ID查询树节点数据 - * - * @param pid - * @param query - * @return - */ - List queryListByPid(@Param("pid") String pid, @Param("query") Map query); - -} diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/rectifylist/mapper/xml/DjInspectionRectifyListMapper.xml b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/rectifylist/mapper/xml/DjInspectionRectifyListMapper.xml deleted file mode 100644 index fbda438..0000000 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/rectifylist/mapper/xml/DjInspectionRectifyListMapper.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - update dj_inspection_rectify_list set has_child = #{status} where id = #{id} - - - - - - \ No newline at end of file diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/rectifylist/service/IDjInspectionRectifyListService.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/rectifylist/service/IDjInspectionRectifyListService.java deleted file mode 100644 index 8cd18f3..0000000 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/rectifylist/service/IDjInspectionRectifyListService.java +++ /dev/null @@ -1,74 +0,0 @@ -package org.jeecg.modules.demo.rectifylist.service; - -import org.jeecg.common.system.vo.SelectTreeModel; -import org.jeecg.modules.demo.rectifylist.entity.DjInspectionRectifyList; -import com.baomidou.mybatisplus.extension.service.IService; -import org.jeecg.common.exception.JeecgBootException; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import java.util.List; - -/** - * @Description: 党建巡视整改提升工作台账 - * @Author: jeecg-boot - * @Date: 2026-03-24 - * @Version: V1.0 - */ -public interface IDjInspectionRectifyListService extends IService { - - /**根节点父ID的值*/ - public static final String ROOT_PID_VALUE = "0"; - - /**树节点有子节点状态值*/ - public static final String HASCHILD = "1"; - - /**树节点无子节点状态值*/ - public static final String NOCHILD = "0"; - - /** - * 新增节点 - * - * @param djInspectionRectifyList - */ - void addDjInspectionRectifyList(DjInspectionRectifyList djInspectionRectifyList); - - /** - * 修改节点 - * - * @param djInspectionRectifyList - * @throws JeecgBootException - */ - void updateDjInspectionRectifyList(DjInspectionRectifyList djInspectionRectifyList) throws JeecgBootException; - - /** - * 删除节点 - * - * @param id - * @throws JeecgBootException - */ - void deleteDjInspectionRectifyList(String id) throws JeecgBootException; - - /** - * 查询所有数据，无分页 - * - * @param queryWrapper - * @return List - */ - List queryTreeListNoPage(QueryWrapper queryWrapper); - - /** - * 【vue3专用】根据父级编码加载分类字典的数据 - * - * @param parentCode - * @return - */ - List queryListByCode(String parentCode); - - /** - * 【vue3专用】根据pid查询子节点集合 - * - * @param pid - * @return - */ - List queryListByPid(String pid); - -} diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/rectifylist/service/impl/DjInspectionRectifyListServiceImpl.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/rectifylist/service/impl/DjInspectionRectifyListServiceImpl.java deleted file mode 100644 index 9bb9205..0000000 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/rectifylist/service/impl/DjInspectionRectifyListServiceImpl.java +++ /dev/null @@ -1,219 +0,0 @@ -package org.jeecg.modules.demo.rectifylist.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import org.jeecg.common.exception.JeecgBootException; -import org.jeecg.common.util.oConvertUtils; -import org.jeecg.common.system.vo.SelectTreeModel; -import org.jeecg.modules.demo.rectifylist.entity.DjInspectionRectifyList; -import org.jeecg.modules.demo.rectifylist.mapper.DjInspectionRectifyListMapper; -import org.jeecg.modules.demo.rectifylist.service.IDjInspectionRectifyListService; -import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import org.springframework.transaction.annotation.Transactional; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -/** - * @Description: 党建巡视整改提升工作台账 - * @Author: jeecg-boot - * @Date: 2026-03-24 - * @Version: V1.0 - */ -@Service -public class DjInspectionRectifyListServiceImpl extends ServiceImpl implements IDjInspectionRectifyListService { - - @Override - public void addDjInspectionRectifyList(DjInspectionRectifyList djInspectionRectifyList) { - //新增时设置hasChild为0 - djInspectionRectifyList.setHasChild(IDjInspectionRectifyListService.NOCHILD); - if(oConvertUtils.isEmpty(djInspectionRectifyList.getPid())){ - djInspectionRectifyList.setPid(IDjInspectionRectifyListService.ROOT_PID_VALUE); - }else{ - //如果当前节点父ID不为空 则设置父节点的hasChildren 为1 - DjInspectionRectifyList parent = baseMapper.selectById(djInspectionRectifyList.getPid()); - if(parent!=null && !"1".equals(parent.getHasChild())){ - parent.setHasChild("1"); - baseMapper.updateById(parent); - } - } - baseMapper.insert(djInspectionRectifyList); - } - - @Override - public void updateDjInspectionRectifyList(DjInspectionRectifyList djInspectionRectifyList) { - DjInspectionRectifyList entity = this.getById(djInspectionRectifyList.getId()); - if(entity==null) { - throw new JeecgBootException("未找到对应实体"); - } - String old_pid = entity.getPid(); - String new_pid = djInspectionRectifyList.getPid(); - if(!old_pid.equals(new_pid)) { - updateOldParentNode(old_pid); - if(oConvertUtils.isEmpty(new_pid)){ - djInspectionRectifyList.setPid(IDjInspectionRectifyListService.ROOT_PID_VALUE); - } - if(!IDjInspectionRectifyListService.ROOT_PID_VALUE.equals(djInspectionRectifyList.getPid())) { - baseMapper.updateTreeNodeStatus(djInspectionRectifyList.getPid(), IDjInspectionRectifyListService.HASCHILD); - } - } - baseMapper.updateById(djInspectionRectifyList); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void deleteDjInspectionRectifyList(String id) throws JeecgBootException { - //查询选中节点下所有子节点一并删除 - id = this.queryTreeChildIds(id); - if(id.indexOf(",")>0) { - StringBuffer sb = new StringBuffer(); - String[] idArr = id.split(","); - for (String idVal : idArr) { - if(idVal != null){ - DjInspectionRectifyList djInspectionRectifyList = this.getById(idVal); - String pidVal = djInspectionRectifyList.getPid(); - //查询此节点上一级是否还有其他子节点 - List dataList = baseMapper.selectList(new QueryWrapper().eq("pid", pidVal).notIn("id",Arrays.asList(idArr))); - boolean flag = (dataList == null || dataList.size() == 0) && !Arrays.asList(idArr).contains(pidVal) && !sb.toString().contains(pidVal); - if(flag){ - //如果当前节点原本有子节点 现在木有了，更新状态 - sb.append(pidVal).append(","); - } - } - } - //批量删除节点 - baseMapper.deleteBatchIds(Arrays.asList(idArr)); - //修改已无子节点的标识 - String[] pidArr = sb.toString().split(","); - for(String pid : pidArr){ - this.updateOldParentNode(pid); - } - }else{ - DjInspectionRectifyList djInspectionRectifyList = this.getById(id); - if(djInspectionRectifyList==null) { - throw new JeecgBootException("未找到对应实体"); - } - updateOldParentNode(djInspectionRectifyList.getPid()); - baseMapper.deleteById(id); - } - } - - @Override - public List queryTreeListNoPage(QueryWrapper queryWrapper) { - List dataList = baseMapper.selectList(queryWrapper); - List mapList = new ArrayList<>(); - for(DjInspectionRectifyList data : dataList){ - String pidVal = data.getPid(); - //递归查询子节点的根节点 - if(pidVal != null && !IDjInspectionRectifyListService.NOCHILD.equals(pidVal)){ - DjInspectionRectifyList rootVal = this.getTreeRoot(pidVal); - if(rootVal != null && !mapList.contains(rootVal)){ - mapList.add(rootVal); - } - }else{ - if(!mapList.contains(data)){ - mapList.add(data); - } - } - } - return mapList; - } - - @Override - public List queryListByCode(String parentCode) { - String pid = ROOT_PID_VALUE; - if (oConvertUtils.isNotEmpty(parentCode)) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(DjInspectionRectifyList::getPid, parentCode); - List list = baseMapper.selectList(queryWrapper); - if (list == null || list.size() == 0) { - throw new JeecgBootException("该编码【" + parentCode + "】不存在，请核实!"); - } - if (list.size() > 1) { - throw new JeecgBootException("该编码【" + parentCode + "】存在多个，请核实!"); - } - pid = list.get(0).getId(); - } - return baseMapper.queryListByPid(pid, null); - } - - @Override - public List queryListByPid(String pid) { - if (oConvertUtils.isEmpty(pid)) { - pid = ROOT_PID_VALUE; - } - return baseMapper.queryListByPid(pid, null); - } - - /** - * 根据所传pid查询旧的父级节点的子节点并修改相应状态值 - * @param pid - */ - private void updateOldParentNode(String pid) { - if(!IDjInspectionRectifyListService.ROOT_PID_VALUE.equals(pid)) { - Long count = baseMapper.selectCount(new QueryWrapper().eq("pid", pid)); - if(count==null || count<=1) { - baseMapper.updateTreeNodeStatus(pid, IDjInspectionRectifyListService.NOCHILD); - } - } - } - - /** - * 递归查询节点的根节点 - * @param pidVal - * @return - */ - private DjInspectionRectifyList getTreeRoot(String pidVal){ - DjInspectionRectifyList data = baseMapper.selectById(pidVal); - if(data != null && !IDjInspectionRectifyListService.ROOT_PID_VALUE.equals(data.getPid())){ - return this.getTreeRoot(data.getPid()); - }else{ - return data; - } - } - - /** - * 根据id查询所有子节点id - * @param ids - * @return - */ - private String queryTreeChildIds(String ids) { - //获取id数组 - String[] idArr = ids.split(","); - StringBuffer sb = new StringBuffer(); - for (String pidVal : idArr) { - if(pidVal != null){ - if(!sb.toString().contains(pidVal)){ - if(sb.toString().length() > 0){ - sb.append(","); - } - sb.append(pidVal); - this.getTreeChildIds(pidVal,sb); - } - } - } - return sb.toString(); - } - - /** - * 递归查询所有子节点 - * @param pidVal - * @param sb - * @return - */ - private StringBuffer getTreeChildIds(String pidVal,StringBuffer sb){ - List dataList = baseMapper.selectList(new QueryWrapper().eq("pid", pidVal)); - if(dataList != null && dataList.size()>0){ - for(DjInspectionRectifyList tree : dataList) { - if(!sb.toString().contains(tree.getId())){ - sb.append(",").append(tree.getId()); - } - this.getTreeChildIds(tree.getId(),sb); - } - } - return sb; - } - -} diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/supervisiontest/controller/SupervisionTestController.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/supervisiontest/controller/SupervisionTestController.java deleted file mode 100644 index 981cd7d..0000000 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/supervisiontest/controller/SupervisionTestController.java +++ /dev/null @@ -1,184 +0,0 @@ -package org.jeecg.modules.demo.supervisiontest.controller; - -import java.util.Arrays; -import java.util.HashMap; -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 org.jeecg.common.api.vo.Result; -import org.jeecg.common.system.query.QueryGenerator; -import org.jeecg.common.system.query.QueryRuleEnum; -import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.demo.supervisiontest.entity.SupervisionTest; -import org.jeecg.modules.demo.supervisiontest.service.ISupervisionTestService; - -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.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Operation; -import org.jeecg.common.aspect.annotation.AutoLog; -import org.apache.shiro.authz.annotation.RequiresPermissions; - /** - * @Description: supervision_test - * @Author: jeecg-boot - * @Date: 2026-03-20 - * @Version: V1.0 - */ -@Tag(name="supervision_test") -@RestController -@RequestMapping("/supervisiontest/supervisionTest") -@Slf4j -public class SupervisionTestController extends JeecgController { - @Autowired - private ISupervisionTestService supervisionTestService; - - /** - * 分页列表查询 - * - * @param supervisionTest - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @AutoLog(value = "supervision_test-分页列表查询") - @Operation(summary="supervision_test-分页列表查询") - @GetMapping(value = "/list") - public Result> queryPageList(SupervisionTest supervisionTest, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - - - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(supervisionTest, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = supervisionTestService.page(page, queryWrapper); - return Result.OK(pageList); - } - - /** - * 添加 - * - * @param supervisionTest - * @return - */ - @AutoLog(value = "supervision_test-添加") - @Operation(summary="supervision_test-添加") - @RequiresPermissions("supervisiontest:supervision_test:add") - @PostMapping(value = "/add") - public Result add(@RequestBody SupervisionTest supervisionTest) { - supervisionTestService.save(supervisionTest); - - return Result.OK("添加成功！"); - } - - /** - * 编辑 - * - * @param supervisionTest - * @return - */ - @AutoLog(value = "supervision_test-编辑") - @Operation(summary="supervision_test-编辑") - @RequiresPermissions("supervisiontest:supervision_test:edit") - @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) - public Result edit(@RequestBody SupervisionTest supervisionTest) { - supervisionTestService.updateById(supervisionTest); - return Result.OK("编辑成功!"); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @AutoLog(value = "supervision_test-通过id删除") - @Operation(summary="supervision_test-通过id删除") - @RequiresPermissions("supervisiontest:supervision_test:delete") - @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { - supervisionTestService.removeById(id); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @AutoLog(value = "supervision_test-批量删除") - @Operation(summary="supervision_test-批量删除") - @RequiresPermissions("supervisiontest:supervision_test:deleteBatch") - @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.supervisionTestService.removeByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功!"); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @AutoLog(value = "supervision_test-通过id查询") - @Operation(summary="supervision_test-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - SupervisionTest supervisionTest = supervisionTestService.getById(id); - if(supervisionTest==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(supervisionTest); - } - - /** - * 导出excel - * - * @param request - * @param supervisionTest - */ - @AutoLog(value = "supervision_test-通过excel导出") - @RequiresPermissions("supervisiontest:supervision_test:exportXls") - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, SupervisionTest supervisionTest) { - return super.exportXls(request, supervisionTest, SupervisionTest.class, "supervision_test"); - } - - /** - * 通过excel导入数据 - * - * @param request - * @param response - * @return - */ - @AutoLog(value = "supervision_test-通过excel导入") - @RequiresPermissions("supervisiontest:supervision_test:importExcel") - @RequestMapping(value = "/importExcel", method = RequestMethod.POST) - public Result importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, SupervisionTest.class); - } - -} diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/supervisiontest/entity/SupervisionTest.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/supervisiontest/entity/SupervisionTest.java deleted file mode 100644 index 1ecea13..0000000 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/supervisiontest/entity/SupervisionTest.java +++ /dev/null @@ -1,89 +0,0 @@ -package org.jeecg.modules.demo.supervisiontest.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 org.jeecg.common.constant.ProvinceCityArea; -import org.jeecg.common.util.SpringContextUtils; -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.v3.oas.annotations.media.Schema; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * @Description: supervision_test - * @Author: jeecg-boot - * @Date: 2026-03-20 - * @Version: V1.0 - */ -@Data -@TableName("supervision_test") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@Schema(description="supervision_test") -public class SupervisionTest implements Serializable { - private static final long serialVersionUID = 1L; - - /**主键*/ - @TableId(type = IdType.ASSIGN_ID) - @Schema(description = "主键") - private java.lang.String id; - /**创建人*/ - @Schema(description = "创建人") - private java.lang.String createBy; - /**创建日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @Schema(description = "创建日期") - private java.util.Date createTime; - /**更新人*/ - @Schema(description = "更新人") - private java.lang.String updateBy; - /**更新日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @Schema(description = "更新日期") - private java.util.Date updateTime; - /**所属部门*/ - @Schema(description = "所属部门") - private java.lang.String sysOrgCode; - /**附件1*/ - @Excel(name = "附件1", width = 15) - @Schema(description = "附件1") - private java.lang.String fileurl1; - /**附件2*/ - @Excel(name = "附件2", width = 15) - @Schema(description = "附件2") - private java.lang.String fileurl2; - /**督办标题*/ - @Excel(name = "督办标题", width = 15) - @Schema(description = "督办标题") - private java.lang.String supervisionTitle; - /**督办人*/ - @Excel(name = "督办人", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "username") - @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username") - @Schema(description = "督办人") - private java.lang.String supervisionPerson; - /**督办部门*/ - @Excel(name = "督办部门", width = 15, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id") - @Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id") - @Schema(description = "督办部门") - private java.lang.String supervisionDepart; - /**督办类型*/ - @Excel(name = "督办类型", width = 15) - @Schema(description = "督办类型") - private java.lang.String supervitionType; - /**删除状态（0，正常，1已删除）*/ - @TableLogic - @Dict(dicCode = "del_flag") - private String delFlag; -} diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/supervisiontest/mapper/SupervisionTestMapper.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/supervisiontest/mapper/SupervisionTestMapper.java deleted file mode 100644 index 53da16c..0000000 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/supervisiontest/mapper/SupervisionTestMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.jeecg.modules.demo.supervisiontest.mapper; - -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.demo.supervisiontest.entity.SupervisionTest; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @Description: supervision_test - * @Author: jeecg-boot - * @Date: 2026-03-20 - * @Version: V1.0 - */ -public interface SupervisionTestMapper extends BaseMapper { - -} diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/supervisiontest/mapper/xml/SupervisionTestMapper.xml b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/supervisiontest/mapper/xml/SupervisionTestMapper.xml deleted file mode 100644 index 37a7817..0000000 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/supervisiontest/mapper/xml/SupervisionTestMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/supervisiontest/service/ISupervisionTestService.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/supervisiontest/service/ISupervisionTestService.java deleted file mode 100644 index 0e86cd3..0000000 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/supervisiontest/service/ISupervisionTestService.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.jeecg.modules.demo.supervisiontest.service; - -import org.jeecg.modules.demo.supervisiontest.entity.SupervisionTest; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * @Description: supervision_test - * @Author: jeecg-boot - * @Date: 2026-03-20 - * @Version: V1.0 - */ -public interface ISupervisionTestService extends IService { - -} diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/supervisiontest/service/impl/SupervisionTestServiceImpl.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/supervisiontest/service/impl/SupervisionTestServiceImpl.java deleted file mode 100644 index a6a2350..0000000 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/supervisiontest/service/impl/SupervisionTestServiceImpl.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.jeecg.modules.demo.supervisiontest.service.impl; - -import org.jeecg.modules.demo.supervisiontest.entity.SupervisionTest; -import org.jeecg.modules.demo.supervisiontest.mapper.SupervisionTestMapper; -import org.jeecg.modules.demo.supervisiontest.service.ISupervisionTestService; -import org.springframework.stereotype.Service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -/** - * @Description: supervision_test - * @Author: jeecg-boot - * @Date: 2026-03-20 - * @Version: V1.0 - */ -@Service -public class SupervisionTestServiceImpl extends ServiceImpl implements ISupervisionTestService { - -} diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/tzMetting/controller/DjMeetingRecordController.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/tzMetting/controller/DjMeetingRecordController.java deleted file mode 100644 index 4f1afa3..0000000 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/tzMetting/controller/DjMeetingRecordController.java +++ /dev/null @@ -1,184 +0,0 @@ -package org.jeecg.modules.demo.tzMetting.controller; - -import java.util.Arrays; -import java.util.HashMap; -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 org.jeecg.common.api.vo.Result; -import org.jeecg.common.system.query.QueryGenerator; -import org.jeecg.common.system.query.QueryRuleEnum; -import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.demo.tzMetting.entity.DjMeetingRecord; -import org.jeecg.modules.demo.tzMetting.service.IDjMeetingRecordService; - -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.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Operation; -import org.jeecg.common.aspect.annotation.AutoLog; -import org.apache.shiro.authz.annotation.RequiresPermissions; - /** - * @Description: 统战座谈会意见台账及督办反馈 - * @Author: jeecg-boot - * @Date: 2026-03-24 - * @Version: V1.0 - */ -@Tag(name="统战座谈会意见台账及督办反馈") -@RestController -@RequestMapping("/tzMetting/djMeetingRecord") -@Slf4j -public class DjMeetingRecordController extends JeecgController { - @Autowired - private IDjMeetingRecordService djMeetingRecordService; - - /** - * 分页列表查询 - * - * @param djMeetingRecord - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @AutoLog(value = "统战座谈会意见台账及督办反馈-分页列表查询") - @Operation(summary="统战座谈会意见台账及督办反馈-分页列表查询") - @GetMapping(value = "/list") - public Result> queryPageList(DjMeetingRecord djMeetingRecord, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - - - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(djMeetingRecord, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = djMeetingRecordService.page(page, queryWrapper); - return Result.OK(pageList); - } - - /** - * 添加 - * - * @param djMeetingRecord - * @return - */ - @AutoLog(value = "统战座谈会意见台账及督办反馈-添加") - @Operation(summary="统战座谈会意见台账及督办反馈-添加") - @RequiresPermissions("tzMetting:dj_meeting_record:add") - @PostMapping(value = "/add") - public Result add(@RequestBody DjMeetingRecord djMeetingRecord) { - djMeetingRecordService.save(djMeetingRecord); - - return Result.OK("添加成功！"); - } - - /** - * 编辑 - * - * @param djMeetingRecord - * @return - */ - @AutoLog(value = "统战座谈会意见台账及督办反馈-编辑") - @Operation(summary="统战座谈会意见台账及督办反馈-编辑") - @RequiresPermissions("tzMetting:dj_meeting_record:edit") - @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) - public Result edit(@RequestBody DjMeetingRecord djMeetingRecord) { - djMeetingRecordService.updateById(djMeetingRecord); - return Result.OK("编辑成功!"); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @AutoLog(value = "统战座谈会意见台账及督办反馈-通过id删除") - @Operation(summary="统战座谈会意见台账及督办反馈-通过id删除") - @RequiresPermissions("tzMetting:dj_meeting_record:delete") - @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { - djMeetingRecordService.removeById(id); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @AutoLog(value = "统战座谈会意见台账及督办反馈-批量删除") - @Operation(summary="统战座谈会意见台账及督办反馈-批量删除") - @RequiresPermissions("tzMetting:dj_meeting_record:deleteBatch") - @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.djMeetingRecordService.removeByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功!"); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @AutoLog(value = "统战座谈会意见台账及督办反馈-通过id查询") - @Operation(summary="统战座谈会意见台账及督办反馈-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - DjMeetingRecord djMeetingRecord = djMeetingRecordService.getById(id); - if(djMeetingRecord==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(djMeetingRecord); - } - - /** - * 导出excel - * - * @param request - * @param djMeetingRecord - */ - @AutoLog(value = "统战座谈会意见台账及督办反馈-通过excel导出") - @RequiresPermissions("tzMetting:dj_meeting_record:exportXls") - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, DjMeetingRecord djMeetingRecord) { - return super.exportXls(request, djMeetingRecord, DjMeetingRecord.class, "统战座谈会意见台账及督办反馈"); - } - - /** - * 通过excel导入数据 - * - * @param request - * @param response - * @return - */ - @AutoLog(value = "统战座谈会意见台账及督办反馈-通过excel导入") - @RequiresPermissions("tzMetting:dj_meeting_record:importExcel") - @RequestMapping(value = "/importExcel", method = RequestMethod.POST) - public Result importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, DjMeetingRecord.class); - } - -} diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/tzMetting/entity/DjMeetingRecord.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/tzMetting/entity/DjMeetingRecord.java deleted file mode 100644 index 7c58bc0..0000000 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/tzMetting/entity/DjMeetingRecord.java +++ /dev/null @@ -1,92 +0,0 @@ -package org.jeecg.modules.demo.tzMetting.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 org.jeecg.common.constant.ProvinceCityArea; -import org.jeecg.common.util.SpringContextUtils; -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.v3.oas.annotations.media.Schema; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * @Description: 统战座谈会意见台账及督办反馈 - * @Author: jeecg-boot - * @Date: 2026-03-24 - * @Version: V1.0 - */ -@Data -@TableName("dj_meeting_record") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@Schema(description="统战座谈会意见台账及督办反馈") -public class DjMeetingRecord implements Serializable { - private static final long serialVersionUID = 1L; - - /**主键*/ - @TableId(type = IdType.ASSIGN_ID) - @Schema(description = "主键") - private java.lang.String id; - /**创建人*/ - @Schema(description = "创建人") - private java.lang.String createBy; - /**创建日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @Schema(description = "创建日期") - private java.util.Date createTime; - /**更新人*/ - @Schema(description = "更新人") - private java.lang.String updateBy; - /**更新日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @Schema(description = "更新日期") - private java.util.Date updateTime; - /**所属部门*/ - @Schema(description = "所属部门") - private java.lang.String sysOrgCode; - /**序号*/ - @Excel(name = "序号", width = 15) - @Schema(description = "序号") - private java.lang.Integer sortNo; - /**问题分类*/ - @Excel(name = "问题分类", width = 15) - @Schema(description = "问题分类") - private java.lang.Integer problemType; - /**具体措施*/ - @Excel(name = "具体措施", width = 15) - @Schema(description = "具体措施") - private java.lang.String specificMeasure; - /**完成时限*/ - @Excel(name = "完成时限", width = 15, format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") - @Schema(description = "完成时限") - private java.util.Date completionDeadline; - /**责任部门*/ - @Excel(name = "责任部门", width = 15) - @Schema(description = "责任部门") - @Dict(dictTable ="sys_depart",dicText = "depart_name",dicCode = "id") - private java.lang.String responsibleDept; - /**完成情况*/ - @Excel(name = "完成情况", width = 15) - @Schema(description = "完成情况") - private java.lang.String completionStatus; - /**是否可发起(0不可发起，1可发起)*/ - @Excel(name = "是否可发起", width = 15) - @Dict(dicCode = "is_launchable") - private String isLaunchable; - @TableLogic(value = "0", delval = "1") - private int delFlag = 0; -} diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/tzMetting/mapper/DjMeetingRecordMapper.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/tzMetting/mapper/DjMeetingRecordMapper.java deleted file mode 100644 index 1dd8148..0000000 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/tzMetting/mapper/DjMeetingRecordMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.jeecg.modules.demo.tzMetting.mapper; - -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.demo.tzMetting.entity.DjMeetingRecord; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @Description: 统战座谈会意见台账及督办反馈 - * @Author: jeecg-boot - * @Date: 2026-03-24 - * @Version: V1.0 - */ -public interface DjMeetingRecordMapper extends BaseMapper { - -} diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/tzMetting/mapper/xml/DjMeetingRecordMapper.xml b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/tzMetting/mapper/xml/DjMeetingRecordMapper.xml deleted file mode 100644 index 0add93d..0000000 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/tzMetting/mapper/xml/DjMeetingRecordMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/tzMetting/service/IDjMeetingRecordService.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/tzMetting/service/IDjMeetingRecordService.java deleted file mode 100644 index f2da28b..0000000 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/tzMetting/service/IDjMeetingRecordService.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.jeecg.modules.demo.tzMetting.service; - -import org.jeecg.modules.demo.tzMetting.entity.DjMeetingRecord; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * @Description: 统战座谈会意见台账及督办反馈 - * @Author: jeecg-boot - * @Date: 2026-03-24 - * @Version: V1.0 - */ -public interface IDjMeetingRecordService extends IService { - -} diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/tzMetting/service/impl/DjMeetingRecordServiceImpl.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/tzMetting/service/impl/DjMeetingRecordServiceImpl.java deleted file mode 100644 index c4c9d27..0000000 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/tzMetting/service/impl/DjMeetingRecordServiceImpl.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.jeecg.modules.demo.tzMetting.service.impl; - -import org.jeecg.modules.demo.tzMetting.entity.DjMeetingRecord; -import org.jeecg.modules.demo.tzMetting.mapper.DjMeetingRecordMapper; -import org.jeecg.modules.demo.tzMetting.service.IDjMeetingRecordService; -import org.springframework.stereotype.Service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -/** - * @Description: 统战座谈会意见台账及督办反馈 - * @Author: jeecg-boot - * @Date: 2026-03-24 - * @Version: V1.0 - */ -@Service -public class DjMeetingRecordServiceImpl extends ServiceImpl implements IDjMeetingRecordService { - -}