diff --git a/src/main/java/com/WisdomSiteApplication.java b/src/main/java/com/WisdomSiteApplication.java index 7235cbc3b..cc3c8c8c0 100644 --- a/src/main/java/com/WisdomSiteApplication.java +++ b/src/main/java/com/WisdomSiteApplication.java @@ -25,13 +25,13 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2; * @author: Mr.Peng * @create: 2020-08-03 14:50 **/ -@MapperScan({"com.zhgd.*.*.*.mapper","com.zhwl.*.*.*.mapper"}) +@MapperScan({"com.zhgd.*.*.*.mapper", "com.zhwl.*.*.*.mapper"}) @EnableAsync //开启异步调用 @EnableScheduling @EnableFileStorage //@EnableConfigurationProperties(FileServerProperties.class) //@EnableConfigurationProperties({FileStorageProperties.class}) -@PropertySource(value="classpath:application.properties",encoding = "utf-8") +@PropertySource(value = "classpath:application.properties", encoding = "utf-8") @SpringBootApplication public class WisdomSiteApplication extends SpringBootServletInitializer { diff --git a/src/main/java/com/zhgd/xmgl/modules/party/controller/PartyMemberActivitySpeakCareController.java b/src/main/java/com/zhgd/xmgl/modules/party/controller/PartyMemberActivitySpeakCareController.java new file mode 100644 index 000000000..130c4b6b9 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/party/controller/PartyMemberActivitySpeakCareController.java @@ -0,0 +1,196 @@ +package com.zhgd.xmgl.modules.party.controller; + +import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zhgd.jeecg.common.api.vo.Result; +import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.jeecg.common.util.oConvertUtils; +import com.zhgd.xmgl.modules.party.entity.PartyMemberActivitySpeakCare; +import com.zhgd.xmgl.modules.party.service.IPartyMemberActivitySpeakCareService; +import com.zhgd.xmgl.modules.smoke.entity.SmokeDev; +import com.zhgd.xmgl.util.RefUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections.MapUtils; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import springfox.documentation.annotations.ApiIgnore; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import java.util.HashMap; +import java.util.List; + + +/** + * @Title: Controller + * @Description: 党员活动、学习讲话、党员关怀 + * @author： pds + * @date： 2023-10-16 + * @version： V1.0 + */ +@RestController +@RequestMapping("/xmgl/partyMemberActivitySpeakCare") +@Slf4j +@Api(tags = "党员活动、学习讲话、党员关怀相关Api") +public class PartyMemberActivitySpeakCareController { + @Autowired + private IPartyMemberActivitySpeakCareService partyMemberActivitySpeakCareService; + + /** + * 分页列表查询 + * + * @param partyMemberActivitySpeakCare + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @ApiOperation(value = "分页列表查询党员活动、学习讲话、党员关怀信息", notes = "分页列表查询党员活动、学习讲话、党员关怀信息", httpMethod = "GET") + @GetMapping(value = "/page") + public Result> queryPageList(PartyMemberActivitySpeakCare partyMemberActivitySpeakCare, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + Result> result = new Result>(); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(partyMemberActivitySpeakCare, req.getParameterMap(), + null, RefUtil.fieldNames(PartyMemberActivitySpeakCare::getTitle)); + queryWrapper.orderByDesc(RefUtil.fieldNameUlc(PartyMemberActivitySpeakCare::getId)); + Page page = new Page(pageNo, pageSize); + IPage pageList = partyMemberActivitySpeakCareService.page(page, queryWrapper); + result.setSuccess(true); + result.setResult(pageList); + return result; + } + + /** + * 列表查询 + * + * @param partyMemberActivitySpeakCare + * @param req + * @return + */ + @ApiOperation(value = "列表查询党员活动、学习讲话、党员关怀信息", notes = "列表查询党员活动、学习讲话、党员关怀信息", httpMethod = "GET") + @GetMapping(value = "/list") + public Result> queryList(PartyMemberActivitySpeakCare partyMemberActivitySpeakCare, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(partyMemberActivitySpeakCare, req.getParameterMap()); + return Result.success(partyMemberActivitySpeakCareService.list(queryWrapper)); + } + + /** + * 添加 + * + * @param partyMemberActivitySpeakCare + * @return + */ + @ApiOperation(value = "添加党员活动、学习讲话、党员关怀信息", notes = "添加党员活动、学习讲话、党员关怀信息", httpMethod = "POST") + @PostMapping(value = "/add") + public Result add(@RequestBody PartyMemberActivitySpeakCare partyMemberActivitySpeakCare) { + partyMemberActivitySpeakCareService.save(partyMemberActivitySpeakCare); + return Result.ok(); + } + + /** + * 编辑 + * + * @param partyMemberActivitySpeakCare + * @return + */ + @ApiOperation(value = "编辑党员活动、学习讲话、党员关怀信息", notes = "编辑党员活动、学习讲话、党员关怀信息", httpMethod = "POST") + @PostMapping(value = "/edit") + public Result edit(@RequestBody PartyMemberActivitySpeakCare partyMemberActivitySpeakCare) { + partyMemberActivitySpeakCareService.updateById(partyMemberActivitySpeakCare); + return Result.ok(); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @ApiOperation(value = "删除党员活动、学习讲话、党员关怀信息", notes = "删除党员活动、学习讲话、党员关怀信息", httpMethod = "POST") + @ApiImplicitParam(name = "id", value = "党员活动、学习讲话、党员关怀ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}") + @PostMapping(value = "/delete") + public Result delete(@ApiIgnore @RequestBody HashMap map) { + String id = MapUtils.getString(map, "id"); + Result result = new Result(); + PartyMemberActivitySpeakCare partyMemberActivitySpeakCare = partyMemberActivitySpeakCareService.getById(id); + if (partyMemberActivitySpeakCare == null) { + result.error500("未找到对应实体"); + } else { + boolean ok = partyMemberActivitySpeakCareService.removeById(id); + if (ok) { + 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(); + PartyMemberActivitySpeakCare partyMemberActivitySpeakCare = partyMemberActivitySpeakCareService.getById(id); + if (partyMemberActivitySpeakCare == null) { + result.error500("未找到对应实体"); + } else { + result.setResult(partyMemberActivitySpeakCare); + 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"); + PartyMemberActivitySpeakCare partyMemberActivitySpeakCare = JSON.parseObject(deString, PartyMemberActivitySpeakCare.class); + queryWrapper = QueryGenerator.initQueryWrapper(partyMemberActivitySpeakCare, request.getParameterMap()); + } + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + + //Step.2 AutoPoi 导出Excel + ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); + List pageList = partyMemberActivitySpeakCareService.list(queryWrapper); + //导出文件名称 + mv.addObject(NormalExcelConstants.FILE_NAME, "党员活动、学习讲话、党员关怀列表"); + mv.addObject(NormalExcelConstants.CLASS, PartyMemberActivitySpeakCare.class); + mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("党员活动、学习讲话、党员关怀列表数据", "导出人:Jeecg", "导出信息")); + mv.addObject(NormalExcelConstants.DATA_LIST, pageList); + return mv; + } + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/party/controller/PartyMemberLearnStrongCountryController.java b/src/main/java/com/zhgd/xmgl/modules/party/controller/PartyMemberLearnStrongCountryController.java new file mode 100644 index 000000000..44b7e0ad3 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/party/controller/PartyMemberLearnStrongCountryController.java @@ -0,0 +1,200 @@ +package com.zhgd.xmgl.modules.party.controller; + +import com.zhgd.xmgl.modules.party.entity.PartyMemberActivitySpeakCare; +import com.zhgd.xmgl.modules.party.entity.PartyMemberLearnStrongCountry; +import com.zhgd.xmgl.modules.party.service.IPartyMemberLearnStrongCountryService; +import com.zhgd.xmgl.util.RefUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; + +import java.util.HashMap; +import java.util.List; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.zhgd.jeecg.common.api.vo.Result; +import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.jeecg.common.util.oConvertUtils; +import org.apache.commons.collections.MapUtils; + +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.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import springfox.documentation.annotations.ApiIgnore; + + +/** + * @Title: Controller + * @Description: 学习强国 + * @author： pds + * @date： 2023-10-16 + * @version： V1.0 + */ +@RestController +@RequestMapping("/xmgl/partyMemberLearnStrongCountry") +@Slf4j +@Api(tags = "学习强国相关Api") +public class PartyMemberLearnStrongCountryController { + @Autowired + private IPartyMemberLearnStrongCountryService partyMemberLearnStrongCountryService; + + /** + * 分页列表查询 + * + * @param partyMemberLearnStrongCountry + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @ApiOperation(value = "分页列表查询学习强国信息", notes = "分页列表查询学习强国信息", httpMethod = "GET") + @GetMapping(value = "/page") + public Result> queryPageList(PartyMemberLearnStrongCountry partyMemberLearnStrongCountry, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + Result> result = new Result>(); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(partyMemberLearnStrongCountry, req.getParameterMap(), + null, RefUtil.fieldNames(PartyMemberLearnStrongCountry::getUserName)); + queryWrapper.orderByDesc(RefUtil.fieldNameUlc(PartyMemberLearnStrongCountry::getId)); + Page page = new Page(pageNo, pageSize); + IPage pageList = partyMemberLearnStrongCountryService.page(page, queryWrapper); + result.setSuccess(true); + result.setResult(pageList); + return result; + } + + /** + * 列表查询 + * + * @param partyMemberLearnStrongCountry + * @param req + * @return + */ + @ApiOperation(value = "列表查询学习强国信息", notes = "列表查询学习强国信息", httpMethod = "GET") + @GetMapping(value = "/list") + public Result> queryList(PartyMemberLearnStrongCountry partyMemberLearnStrongCountry, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(partyMemberLearnStrongCountry, req.getParameterMap()); + return Result.success(partyMemberLearnStrongCountryService.list(queryWrapper)); + } + + /** + * 添加 + * + * @param partyMemberLearnStrongCountry + * @return + */ + @ApiOperation(value = "添加学习强国信息", notes = "添加学习强国信息", httpMethod = "POST") + @PostMapping(value = "/add") + public Result add(@RequestBody PartyMemberLearnStrongCountry partyMemberLearnStrongCountry) { + partyMemberLearnStrongCountryService.save(partyMemberLearnStrongCountry); + return Result.ok(); + } + + /** + * 编辑 + * + * @param partyMemberLearnStrongCountry + * @return + */ + @ApiOperation(value = "编辑学习强国信息", notes = "编辑学习强国信息", httpMethod = "POST") + @PostMapping(value = "/edit") + public Result edit(@RequestBody PartyMemberLearnStrongCountry partyMemberLearnStrongCountry) { + partyMemberLearnStrongCountryService.updateById(partyMemberLearnStrongCountry); + return Result.ok(); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @ApiOperation(value = "删除学习强国信息", notes = "删除学习强国信息", httpMethod = "POST") + @ApiImplicitParam(name = "id", value = "学习强国ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}") + @PostMapping(value = "/delete") + public Result delete(@ApiIgnore @RequestBody HashMap map) { + String id = MapUtils.getString(map, "id"); + Result result = new Result(); + PartyMemberLearnStrongCountry partyMemberLearnStrongCountry = partyMemberLearnStrongCountryService.getById(id); + if (partyMemberLearnStrongCountry == null) { + result.error500("未找到对应实体"); + } else { + boolean ok = partyMemberLearnStrongCountryService.removeById(id); + if (ok) { + 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(); + PartyMemberLearnStrongCountry partyMemberLearnStrongCountry = partyMemberLearnStrongCountryService.getById(id); + if (partyMemberLearnStrongCountry == null) { + result.error500("未找到对应实体"); + } else { + result.setResult(partyMemberLearnStrongCountry); + 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"); + PartyMemberLearnStrongCountry partyMemberLearnStrongCountry = JSON.parseObject(deString, PartyMemberLearnStrongCountry.class); + queryWrapper = QueryGenerator.initQueryWrapper(partyMemberLearnStrongCountry, request.getParameterMap()); + } + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + + //Step.2 AutoPoi 导出Excel + ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); + List pageList = partyMemberLearnStrongCountryService.list(queryWrapper); + //导出文件名称 + mv.addObject(NormalExcelConstants.FILE_NAME, "学习强国列表"); + mv.addObject(NormalExcelConstants.CLASS, PartyMemberLearnStrongCountry.class); + mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("学习强国列表数据", "导出人:Jeecg", "导出信息")); + mv.addObject(NormalExcelConstants.DATA_LIST, pageList); + return mv; + } + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/party/controller/PartyMemberManageController.java b/src/main/java/com/zhgd/xmgl/modules/party/controller/PartyMemberManageController.java new file mode 100644 index 000000000..824ad3787 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/party/controller/PartyMemberManageController.java @@ -0,0 +1,200 @@ +package com.zhgd.xmgl.modules.party.controller; + +import com.zhgd.xmgl.modules.party.entity.PartyMemberLearnStrongCountry; +import com.zhgd.xmgl.modules.party.entity.PartyMemberManage; +import com.zhgd.xmgl.modules.party.service.IPartyMemberManageService; +import com.zhgd.xmgl.util.RefUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; + +import java.util.HashMap; +import java.util.List; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.zhgd.jeecg.common.api.vo.Result; +import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.jeecg.common.util.oConvertUtils; +import org.apache.commons.collections.MapUtils; + +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.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import springfox.documentation.annotations.ApiIgnore; + + +/** + * @Title: Controller + * @Description: 党员管理 + * @author： pds + * @date： 2023-10-16 + * @version： V1.0 + */ +@RestController +@RequestMapping("/xmgl/partyMemberManage") +@Slf4j +@Api(tags = "党员管理相关Api") +public class PartyMemberManageController { + @Autowired + private IPartyMemberManageService partyMemberManageService; + + /** + * 分页列表查询 + * + * @param partyMemberManage + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @ApiOperation(value = "分页列表查询党员管理信息", notes = "分页列表查询党员管理信息", httpMethod = "GET") + @GetMapping(value = "/page") + public Result> queryPageList(PartyMemberManage partyMemberManage, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + Result> result = new Result>(); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(partyMemberManage, req.getParameterMap(), + null, RefUtil.fieldNames(PartyMemberManage::getUserName)); + queryWrapper.orderByDesc(RefUtil.fieldNameUlc(PartyMemberManage::getId)); + Page page = new Page(pageNo, pageSize); + IPage pageList = partyMemberManageService.page(page, queryWrapper); + result.setSuccess(true); + result.setResult(pageList); + return result; + } + + /** + * 列表查询 + * + * @param partyMemberManage + * @param req + * @return + */ + @ApiOperation(value = "列表查询党员管理信息", notes = "列表查询党员管理信息", httpMethod = "GET") + @GetMapping(value = "/list") + public Result> queryList(PartyMemberManage partyMemberManage, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(partyMemberManage, req.getParameterMap()); + return Result.success(partyMemberManageService.list(queryWrapper)); + } + + /** + * 添加 + * + * @param partyMemberManage + * @return + */ + @ApiOperation(value = "添加党员管理信息", notes = "添加党员管理信息", httpMethod = "POST") + @PostMapping(value = "/add") + public Result add(@RequestBody PartyMemberManage partyMemberManage) { + partyMemberManageService.save(partyMemberManage); + return Result.ok(); + } + + /** + * 编辑 + * + * @param partyMemberManage + * @return + */ + @ApiOperation(value = "编辑党员管理信息", notes = "编辑党员管理信息", httpMethod = "POST") + @PostMapping(value = "/edit") + public Result edit(@RequestBody PartyMemberManage partyMemberManage) { + partyMemberManageService.updateById(partyMemberManage); + return Result.ok(); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @ApiOperation(value = "删除党员管理信息", notes = "删除党员管理信息", httpMethod = "POST") + @ApiImplicitParam(name = "id", value = "党员管理ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}") + @PostMapping(value = "/delete") + public Result delete(@ApiIgnore @RequestBody HashMap map) { + String id = MapUtils.getString(map, "id"); + Result result = new Result(); + PartyMemberManage partyMemberManage = partyMemberManageService.getById(id); + if (partyMemberManage == null) { + result.error500("未找到对应实体"); + } else { + boolean ok = partyMemberManageService.removeById(id); + if (ok) { + 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(); + PartyMemberManage partyMemberManage = partyMemberManageService.getById(id); + if (partyMemberManage == null) { + result.error500("未找到对应实体"); + } else { + result.setResult(partyMemberManage); + 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"); + PartyMemberManage partyMemberManage = JSON.parseObject(deString, PartyMemberManage.class); + queryWrapper = QueryGenerator.initQueryWrapper(partyMemberManage, request.getParameterMap()); + } + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + + //Step.2 AutoPoi 导出Excel + ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); + List pageList = partyMemberManageService.list(queryWrapper); + //导出文件名称 + mv.addObject(NormalExcelConstants.FILE_NAME, "党员管理列表"); + mv.addObject(NormalExcelConstants.CLASS, PartyMemberManage.class); + mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("党员管理列表数据", "导出人:Jeecg", "导出信息")); + mv.addObject(NormalExcelConstants.DATA_LIST, pageList); + return mv; + } + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/party/controller/PartyPromotionalVideoController.java b/src/main/java/com/zhgd/xmgl/modules/party/controller/PartyPromotionalVideoController.java new file mode 100644 index 000000000..f7ff2d39f --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/party/controller/PartyPromotionalVideoController.java @@ -0,0 +1,196 @@ +package com.zhgd.xmgl.modules.party.controller; + +import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zhgd.jeecg.common.api.vo.Result; +import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.jeecg.common.util.oConvertUtils; +import com.zhgd.xmgl.modules.party.entity.PartyMemberManage; +import com.zhgd.xmgl.modules.party.entity.PartyPromotionalVideo; +import com.zhgd.xmgl.modules.party.service.IPartyPromotionalVideoService; +import com.zhgd.xmgl.util.RefUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections.MapUtils; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import springfox.documentation.annotations.ApiIgnore; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import java.util.HashMap; +import java.util.List; + + +/** + * @Title: Controller + * @Description: 宣传视频 + * @author： pds + * @date： 2023-10-16 + * @version： V1.0 + */ +@RestController +@RequestMapping("/xmgl/partyPromotionalVideo") +@Slf4j +@Api(tags = "宣传视频相关Api") +public class PartyPromotionalVideoController { + @Autowired + private IPartyPromotionalVideoService partyPromotionalVideoService; + + /** + * 分页列表查询 + * + * @param partyPromotionalVideo + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @ApiOperation(value = "分页列表查询宣传视频信息", notes = "分页列表查询宣传视频信息", httpMethod = "GET") + @GetMapping(value = "/page") + public Result> queryPageList(PartyPromotionalVideo partyPromotionalVideo, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + Result> result = new Result>(); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(partyPromotionalVideo, req.getParameterMap(), + null, RefUtil.fieldNames(PartyPromotionalVideo::getVideoName)); + queryWrapper.orderByDesc(RefUtil.fieldNameUlc(PartyPromotionalVideo::getId)); + Page page = new Page(pageNo, pageSize); + IPage pageList = partyPromotionalVideoService.page(page, queryWrapper); + result.setSuccess(true); + result.setResult(pageList); + return result; + } + + /** + * 列表查询 + * + * @param partyPromotionalVideo + * @param req + * @return + */ + @ApiOperation(value = "列表查询宣传视频信息", notes = "列表查询宣传视频信息", httpMethod = "GET") + @GetMapping(value = "/list") + public Result> queryList(PartyPromotionalVideo partyPromotionalVideo, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(partyPromotionalVideo, req.getParameterMap()); + return Result.success(partyPromotionalVideoService.list(queryWrapper)); + } + + /** + * 添加 + * + * @param partyPromotionalVideo + * @return + */ + @ApiOperation(value = "添加宣传视频信息", notes = "添加宣传视频信息", httpMethod = "POST") + @PostMapping(value = "/add") + public Result add(@RequestBody PartyPromotionalVideo partyPromotionalVideo) { + partyPromotionalVideoService.save(partyPromotionalVideo); + return Result.ok(); + } + + /** + * 编辑 + * + * @param partyPromotionalVideo + * @return + */ + @ApiOperation(value = "编辑宣传视频信息", notes = "编辑宣传视频信息", httpMethod = "POST") + @PostMapping(value = "/edit") + public Result edit(@RequestBody PartyPromotionalVideo partyPromotionalVideo) { + partyPromotionalVideoService.updateById(partyPromotionalVideo); + return Result.ok(); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @ApiOperation(value = "删除宣传视频信息", notes = "删除宣传视频信息", httpMethod = "POST") + @ApiImplicitParam(name = "id", value = "宣传视频ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}") + @PostMapping(value = "/delete") + public Result delete(@ApiIgnore @RequestBody HashMap map) { + String id = MapUtils.getString(map, "id"); + Result result = new Result(); + PartyPromotionalVideo partyPromotionalVideo = partyPromotionalVideoService.getById(id); + if (partyPromotionalVideo == null) { + result.error500("未找到对应实体"); + } else { + boolean ok = partyPromotionalVideoService.removeById(id); + if (ok) { + 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(); + PartyPromotionalVideo partyPromotionalVideo = partyPromotionalVideoService.getById(id); + if (partyPromotionalVideo == null) { + result.error500("未找到对应实体"); + } else { + result.setResult(partyPromotionalVideo); + 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"); + PartyPromotionalVideo partyPromotionalVideo = JSON.parseObject(deString, PartyPromotionalVideo.class); + queryWrapper = QueryGenerator.initQueryWrapper(partyPromotionalVideo, request.getParameterMap()); + } + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + + //Step.2 AutoPoi 导出Excel + ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); + List pageList = partyPromotionalVideoService.list(queryWrapper); + //导出文件名称 + mv.addObject(NormalExcelConstants.FILE_NAME, "宣传视频列表"); + mv.addObject(NormalExcelConstants.CLASS, PartyPromotionalVideo.class); + mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("宣传视频列表数据", "导出人:Jeecg", "导出信息")); + mv.addObject(NormalExcelConstants.DATA_LIST, pageList); + return mv; + } + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/party/entity/PartyMemberActivitySpeakCare.java b/src/main/java/com/zhgd/xmgl/modules/party/entity/PartyMemberActivitySpeakCare.java new file mode 100644 index 000000000..5c974476c --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/party/entity/PartyMemberActivitySpeakCare.java @@ -0,0 +1,79 @@ +package com.zhgd.xmgl.modules.party.entity; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * @Description: 党员活动、学习讲话、党员关怀 + * @author： pds + * @date： 2023-10-16 + * @version： V1.0 + */ +@Data +@TableName("party_member_activity_speak_care") +@ApiModel(value = "PartyMemberActivitySpeakCare实体类", description = "PartyMemberActivitySpeakCare") +public class PartyMemberActivitySpeakCare 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 image; + /** + * 标题 + */ + @Excel(name = "标题", width = 15) + @ApiModelProperty(value = "标题") + private java.lang.String title; + /** + * 内容 + */ + @Excel(name = "内容", width = 15) + @ApiModelProperty(value = "内容") + private String content; + /** + * 类型：1党员活动2学习讲话3党员关怀 + */ + @Excel(name = "类型：1党员活动2学习讲话3党员关怀", width = 15) + @ApiModelProperty(value = "类型：1党员活动2学习讲话3党员关怀") + private java.lang.Integer type; + /** + * 项目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/party/entity/PartyMemberLearnStrongCountry.java b/src/main/java/com/zhgd/xmgl/modules/party/entity/PartyMemberLearnStrongCountry.java new file mode 100644 index 000000000..d348e3494 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/party/entity/PartyMemberLearnStrongCountry.java @@ -0,0 +1,67 @@ +package com.zhgd.xmgl.modules.party.entity; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * @Description: 学习强国 + * @author： pds + * @date： 2023-10-16 + * @version： V1.0 + */ +@Data +@TableName("party_member_learn_strong_country") +@ApiModel(value = "PartyMemberLearnStrongCountry实体类", description = "PartyMemberLearnStrongCountry") +public class PartyMemberLearnStrongCountry 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 userName; + /** + * 分数 + */ + @Excel(name = "分数", width = 15) + @ApiModelProperty(value = "分数") + private java.lang.Integer score; + /** + * 项目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/party/entity/PartyMemberManage.java b/src/main/java/com/zhgd/xmgl/modules/party/entity/PartyMemberManage.java new file mode 100644 index 000000000..edbe2cf9e --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/party/entity/PartyMemberManage.java @@ -0,0 +1,125 @@ +package com.zhgd.xmgl.modules.party.entity; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * @Description: 党员管理 + * @author： pds + * @date： 2023-10-16 + * @version： V1.0 + */ +@Data +@TableName("party_member_manage") +@ApiModel(value = "PartyMemberManage实体类", description = "PartyMemberManage") +public class PartyMemberManage 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 image; + /** + * 姓名 + */ + @Excel(name = "姓名", width = 15) + @ApiModelProperty(value = "姓名") + private java.lang.String userName; + /** + * 联系电话 + */ + @Excel(name = "联系电话", width = 15) + @ApiModelProperty(value = "联系电话") + private java.lang.String contactNumber; + /** + * 性别 + */ + @Excel(name = "性别", width = 15) + @ApiModelProperty(value = "性别") + private java.lang.String gender; + /** + * 民族 + */ + @Excel(name = "民族", width = 15) + @ApiModelProperty(value = "民族") + private java.lang.String nation; + /** + * 出生日期 + */ + @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 birthDate; + /** + * 岗位类型 + */ + @Excel(name = "岗位类型", width = 15) + @ApiModelProperty(value = "岗位类型") + private java.lang.String positionType; + /** + * 入党时间 + */ + @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 joinPartyTime; + /** + * 政治面貌 + */ + @Excel(name = "政治面貌", width = 15) + @ApiModelProperty(value = "政治面貌") + private java.lang.String politicalStatus; + /** + * 文化程度 + */ + @Excel(name = "文化程度", width = 15) + @ApiModelProperty(value = "文化程度") + private java.lang.String educationLevel; + /** + * 入党宣言 + */ + @Excel(name = "入党宣言", width = 15) + @ApiModelProperty(value = "入党宣言") + private String joinPartyDeclaration; + /** + * 项目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/party/entity/PartyPromotionalVideo.java b/src/main/java/com/zhgd/xmgl/modules/party/entity/PartyPromotionalVideo.java new file mode 100644 index 000000000..cd1e7253f --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/party/entity/PartyPromotionalVideo.java @@ -0,0 +1,67 @@ +package com.zhgd.xmgl.modules.party.entity; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * @Description: 宣传视频 + * @author： pds + * @date： 2023-10-16 + * @version： V1.0 + */ +@Data +@TableName("party_promotional_video") +@ApiModel(value = "PartyPromotionalVideo实体类", description = "PartyPromotionalVideo") +public class PartyPromotionalVideo 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 videoName; + /** + * 文件 + */ + @Excel(name = "文件", width = 15) + @ApiModelProperty(value = "文件") + private java.lang.String file; + /** + * 项目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/party/mapper/PartyMemberActivitySpeakCareMapper.java b/src/main/java/com/zhgd/xmgl/modules/party/mapper/PartyMemberActivitySpeakCareMapper.java new file mode 100644 index 000000000..99e3406cf --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/party/mapper/PartyMemberActivitySpeakCareMapper.java @@ -0,0 +1,16 @@ +package com.zhgd.xmgl.modules.party.mapper; + +import com.zhgd.xmgl.modules.party.entity.PartyMemberActivitySpeakCare; +import org.apache.ibatis.annotations.Mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 党员活动、学习讲话、党员关怀 + * @author： pds + * @date： 2023-10-16 + * @version： V1.0 + */ +@Mapper +public interface PartyMemberActivitySpeakCareMapper extends BaseMapper { + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/party/mapper/PartyMemberLearnStrongCountryMapper.java b/src/main/java/com/zhgd/xmgl/modules/party/mapper/PartyMemberLearnStrongCountryMapper.java new file mode 100644 index 000000000..79c3210da --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/party/mapper/PartyMemberLearnStrongCountryMapper.java @@ -0,0 +1,16 @@ +package com.zhgd.xmgl.modules.party.mapper; + +import com.zhgd.xmgl.modules.party.entity.PartyMemberLearnStrongCountry; +import org.apache.ibatis.annotations.Mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 学习强国 + * @author： pds + * @date： 2023-10-16 + * @version： V1.0 + */ +@Mapper +public interface PartyMemberLearnStrongCountryMapper extends BaseMapper { + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/party/mapper/PartyMemberManageMapper.java b/src/main/java/com/zhgd/xmgl/modules/party/mapper/PartyMemberManageMapper.java new file mode 100644 index 000000000..236c8ac55 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/party/mapper/PartyMemberManageMapper.java @@ -0,0 +1,16 @@ +package com.zhgd.xmgl.modules.party.mapper; + +import com.zhgd.xmgl.modules.party.entity.PartyMemberManage; +import org.apache.ibatis.annotations.Mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 党员管理 + * @author： pds + * @date： 2023-10-16 + * @version： V1.0 + */ +@Mapper +public interface PartyMemberManageMapper extends BaseMapper { + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/party/mapper/PartyPromotionalVideoMapper.java b/src/main/java/com/zhgd/xmgl/modules/party/mapper/PartyPromotionalVideoMapper.java new file mode 100644 index 000000000..f18e19a03 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/party/mapper/PartyPromotionalVideoMapper.java @@ -0,0 +1,16 @@ +package com.zhgd.xmgl.modules.party.mapper; + +import com.zhgd.xmgl.modules.party.entity.PartyPromotionalVideo; +import org.apache.ibatis.annotations.Mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 宣传视频 + * @author： pds + * @date： 2023-10-16 + * @version： V1.0 + */ +@Mapper +public interface PartyPromotionalVideoMapper extends BaseMapper { + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/party/mapper/xml/PartyMemberActivitySpeakCareMapper.xml b/src/main/java/com/zhgd/xmgl/modules/party/mapper/xml/PartyMemberActivitySpeakCareMapper.xml new file mode 100644 index 000000000..c8f6a4986 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/party/mapper/xml/PartyMemberActivitySpeakCareMapper.xml @@ -0,0 +1,4 @@ + + + + diff --git a/src/main/java/com/zhgd/xmgl/modules/party/mapper/xml/PartyMemberLearnStrongCountryMapper.xml b/src/main/java/com/zhgd/xmgl/modules/party/mapper/xml/PartyMemberLearnStrongCountryMapper.xml new file mode 100644 index 000000000..c406bc841 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/party/mapper/xml/PartyMemberLearnStrongCountryMapper.xml @@ -0,0 +1,4 @@ + + + + diff --git a/src/main/java/com/zhgd/xmgl/modules/party/mapper/xml/PartyMemberManageMapper.xml b/src/main/java/com/zhgd/xmgl/modules/party/mapper/xml/PartyMemberManageMapper.xml new file mode 100644 index 000000000..7bfe18712 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/party/mapper/xml/PartyMemberManageMapper.xml @@ -0,0 +1,4 @@ + + + + diff --git a/src/main/java/com/zhgd/xmgl/modules/party/mapper/xml/PartyPromotionalVideoMapper.xml b/src/main/java/com/zhgd/xmgl/modules/party/mapper/xml/PartyPromotionalVideoMapper.xml new file mode 100644 index 000000000..28c65b87e --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/party/mapper/xml/PartyPromotionalVideoMapper.xml @@ -0,0 +1,4 @@ + + + + diff --git a/src/main/java/com/zhgd/xmgl/modules/party/service/IPartyMemberActivitySpeakCareService.java b/src/main/java/com/zhgd/xmgl/modules/party/service/IPartyMemberActivitySpeakCareService.java new file mode 100644 index 000000000..ad9bc5349 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/party/service/IPartyMemberActivitySpeakCareService.java @@ -0,0 +1,14 @@ +package com.zhgd.xmgl.modules.party.service; + +import com.zhgd.xmgl.modules.party.entity.PartyMemberActivitySpeakCare; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 党员活动、学习讲话、党员关怀 + * @author： pds + * @date： 2023-10-16 + * @version： V1.0 + */ +public interface IPartyMemberActivitySpeakCareService extends IService { + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/party/service/IPartyMemberLearnStrongCountryService.java b/src/main/java/com/zhgd/xmgl/modules/party/service/IPartyMemberLearnStrongCountryService.java new file mode 100644 index 000000000..645e0ff26 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/party/service/IPartyMemberLearnStrongCountryService.java @@ -0,0 +1,14 @@ +package com.zhgd.xmgl.modules.party.service; + +import com.zhgd.xmgl.modules.party.entity.PartyMemberLearnStrongCountry; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 学习强国 + * @author： pds + * @date： 2023-10-16 + * @version： V1.0 + */ +public interface IPartyMemberLearnStrongCountryService extends IService { + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/party/service/IPartyMemberManageService.java b/src/main/java/com/zhgd/xmgl/modules/party/service/IPartyMemberManageService.java new file mode 100644 index 000000000..93716a328 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/party/service/IPartyMemberManageService.java @@ -0,0 +1,14 @@ +package com.zhgd.xmgl.modules.party.service; + +import com.zhgd.xmgl.modules.party.entity.PartyMemberManage; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 党员管理 + * @author： pds + * @date： 2023-10-16 + * @version： V1.0 + */ +public interface IPartyMemberManageService extends IService { + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/party/service/IPartyPromotionalVideoService.java b/src/main/java/com/zhgd/xmgl/modules/party/service/IPartyPromotionalVideoService.java new file mode 100644 index 000000000..8dbefec4a --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/party/service/IPartyPromotionalVideoService.java @@ -0,0 +1,14 @@ +package com.zhgd.xmgl.modules.party.service; + +import com.zhgd.xmgl.modules.party.entity.PartyPromotionalVideo; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 宣传视频 + * @author： pds + * @date： 2023-10-16 + * @version： V1.0 + */ +public interface IPartyPromotionalVideoService extends IService { + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/party/service/impl/PartyMemberActivitySpeakCareServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/party/service/impl/PartyMemberActivitySpeakCareServiceImpl.java new file mode 100644 index 000000000..93a93753d --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/party/service/impl/PartyMemberActivitySpeakCareServiceImpl.java @@ -0,0 +1,19 @@ +package com.zhgd.xmgl.modules.party.service.impl; + +import com.zhgd.xmgl.modules.party.entity.PartyMemberActivitySpeakCare; +import com.zhgd.xmgl.modules.party.mapper.PartyMemberActivitySpeakCareMapper; +import com.zhgd.xmgl.modules.party.service.IPartyMemberActivitySpeakCareService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 党员活动、学习讲话、党员关怀 + * @author： pds + * @date： 2023-10-16 + * @version： V1.0 + */ +@Service +public class PartyMemberActivitySpeakCareServiceImpl extends ServiceImpl implements IPartyMemberActivitySpeakCareService { + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/party/service/impl/PartyMemberLearnStrongCountryServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/party/service/impl/PartyMemberLearnStrongCountryServiceImpl.java new file mode 100644 index 000000000..1cd11b97d --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/party/service/impl/PartyMemberLearnStrongCountryServiceImpl.java @@ -0,0 +1,19 @@ +package com.zhgd.xmgl.modules.party.service.impl; + +import com.zhgd.xmgl.modules.party.entity.PartyMemberLearnStrongCountry; +import com.zhgd.xmgl.modules.party.mapper.PartyMemberLearnStrongCountryMapper; +import com.zhgd.xmgl.modules.party.service.IPartyMemberLearnStrongCountryService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 学习强国 + * @author： pds + * @date： 2023-10-16 + * @version： V1.0 + */ +@Service +public class PartyMemberLearnStrongCountryServiceImpl extends ServiceImpl implements IPartyMemberLearnStrongCountryService { + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/party/service/impl/PartyMemberManageServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/party/service/impl/PartyMemberManageServiceImpl.java new file mode 100644 index 000000000..627f52107 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/party/service/impl/PartyMemberManageServiceImpl.java @@ -0,0 +1,19 @@ +package com.zhgd.xmgl.modules.party.service.impl; + +import com.zhgd.xmgl.modules.party.entity.PartyMemberManage; +import com.zhgd.xmgl.modules.party.mapper.PartyMemberManageMapper; +import com.zhgd.xmgl.modules.party.service.IPartyMemberManageService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 党员管理 + * @author： pds + * @date： 2023-10-16 + * @version： V1.0 + */ +@Service +public class PartyMemberManageServiceImpl extends ServiceImpl implements IPartyMemberManageService { + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/party/service/impl/PartyPromotionalVideoServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/party/service/impl/PartyPromotionalVideoServiceImpl.java new file mode 100644 index 000000000..e7f0e97ff --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/party/service/impl/PartyPromotionalVideoServiceImpl.java @@ -0,0 +1,19 @@ +package com.zhgd.xmgl.modules.party.service.impl; + +import com.zhgd.xmgl.modules.party.entity.PartyPromotionalVideo; +import com.zhgd.xmgl.modules.party.mapper.PartyPromotionalVideoMapper; +import com.zhgd.xmgl.modules.party.service.IPartyPromotionalVideoService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 宣传视频 + * @author： pds + * @date： 2023-10-16 + * @version： V1.0 + */ +@Service +public class PartyPromotionalVideoServiceImpl extends ServiceImpl implements IPartyPromotionalVideoService { + +} diff --git a/src/main/java/com/zhgd/xmgl/util/RefUtil.java b/src/main/java/com/zhgd/xmgl/util/RefUtil.java index a8e1796d9..20ebea121 100644 --- a/src/main/java/com/zhgd/xmgl/util/RefUtil.java +++ b/src/main/java/com/zhgd/xmgl/util/RefUtil.java @@ -21,18 +21,6 @@ public class RefUtil { private static Map, Field> cache = new ConcurrentHashMap<>(); - /** - * 获取字段名列表（前面拼上别名，即：“别名.属性名”） - * - * @param alias - * @param functions - * @param - * @param - * @return - */ - public static List fieldNames(String alias, SerializableFunction... functions) { - return Arrays.stream(functions).map(function -> alias + "." + fieldName(function)).collect(Collectors.toList()); - } /** * 获取字段名列表 diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 17589093f..12497eb97 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -52,7 +52,7 @@ mqtt.username=admin mqtt.password=public #mqtt.url=tcp://139.159.226.224:1883 #mqtt.url=ws://139.159.226.224:8083/mqtt -mqtt.url=tcp://182.90.224.147:1883 +mqtt.url=tcp://jxj.zhgdyun.com:1883 # 消费者和提供者对应的客户端id以及默认topic mqtt.producer.clientId=mqttProd mqtt.producer.defaultTopic=topic1