springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml
@@ -23,49 +23,8 @@ </component> <component name="ChangeListManager"> <list default="true" id="8ba27629-3e5d-4f42-993e-d0c055bc9371" name="Default Changelist" comment=""> <change afterPath="$PROJECT_DIR$/../.gitignore" afterDir="false" /> <change beforePath="$PROJECT_DIR$/../.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/applets.log.2021-02-05.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/applets.log.2021-02-05.log" afterDir="false" /> <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/applets.log.2021-02-18.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/applets.log.2021-02-18.log" afterDir="false" /> <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/applets.log.2021-02-19.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/applets.log.2021-02-19.log" afterDir="false" /> <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/applets.log.2021-02-20.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/applets.log.2021-02-20.log" afterDir="false" /> <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/applets_backstage.log.2021-02-05.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/applets_backstage.log.2021-02-05.log" afterDir="false" /> <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/applets_backstage.log.2021-02-18.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/applets_backstage.log.2021-02-18.log" afterDir="false" /> <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/applets_backstage.log.2021-02-19.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/applets_backstage.log.2021-02-19.log" afterDir="false" /> <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/applets_backstage.log.2021-02-20.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/applets_backstage.log.2021-02-20.log" afterDir="false" /> <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/auth.log.2021-02-05.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/auth.log.2021-02-05.log" afterDir="false" /> <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/auth.log.2021-02-18.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/auth.log.2021-02-18.log" afterDir="false" /> <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/auth.log.2021-02-19.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/auth.log.2021-02-19.log" afterDir="false" /> <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/auth.log.2021-02-20.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/auth.log.2021-02-20.log" afterDir="false" /> <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/community_backstage.log.2021-02-05.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/community_backstage.log.2021-02-05.log" afterDir="false" /> <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/community_backstage.log.2021-02-18.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/community_backstage.log.2021-02-18.log" afterDir="false" /> <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/community_backstage.log.2021-02-19.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/community_backstage.log.2021-02-19.log" afterDir="false" /> <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/community_backstage.log.2021-02-20.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/community_backstage.log.2021-02-20.log" afterDir="false" /> <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/config_server.log.2020-12-28.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/config_server.log.2020-12-28.log" afterDir="false" /> <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/config_server.log.2020-12-29.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/config_server.log.2020-12-29.log" afterDir="false" /> <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/eureka_server.log.2020-12-28.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/eureka_server.log.2020-12-28.log" afterDir="false" /> <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/eureka_server.log.2020-12-29.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/eureka_server.log.2020-12-29.log" afterDir="false" /> <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/service_community.log.2021-02-05.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/service_community.log.2021-02-05.log" afterDir="false" /> <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/service_community.log.2021-02-18.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/service_community.log.2021-02-18.log" afterDir="false" /> <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/service_community.log.2021-02-19.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/service_community.log.2021-02-19.log" afterDir="false" /> <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/service_community.log.2021-02-20.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/service_community.log.2021-02-20.log" afterDir="false" /> <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/service_partybuilding.log.2021-02-05.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/service_partybuilding.log.2021-02-05.log" afterDir="false" /> <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/service_partybuilding.log.2021-02-18.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/service_partybuilding.log.2021-02-18.log" afterDir="false" /> <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/service_partybuilding.log.2021-02-19.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/service_partybuilding.log.2021-02-19.log" afterDir="false" /> <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/service_partybuilding.log.2021-02-20.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/service_partybuilding.log.2021-02-20.log" afterDir="false" /> <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/service_user.log.2021-02-05.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/service_user.log.2021-02-05.log" afterDir="false" /> <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/service_user.log.2021-02-18.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/service_user.log.2021-02-18.log" afterDir="false" /> <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/service_user.log.2021-02-19.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/service_user.log.2021-02-19.log" afterDir="false" /> <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/service_user.log.2021-02-20.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/service_user.log.2021-02-20.log" afterDir="false" /> <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/zuul.log.2021-02-01.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/zuul.log.2021-02-01.log" afterDir="false" /> <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/zuul.log.2021-02-05.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/zuul.log.2021-02-05.log" afterDir="false" /> <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/zuul.log.2021-02-18.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/zuul.log.2021-02-18.log" afterDir="false" /> <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/zuul.log.2021-02-19.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/zuul.log.2021-02-19.log" afterDir="false" /> <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/zuul.log.2021-02-20.log" beforeDir="false" afterPath="$PROJECT_DIR$/common/LOG_HOME_IS_UNDEFINED/zuul.log.2021-02-20.log" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/dtos/community/ComCvtCategoryDTO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/dtos/community/ComCvtCategoryDTO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java" afterDir="false" /> </list> <option name="SHOW_DIALOG" value="false" /> <option name="HIGHLIGHT_CONFLICTS" value="true" /> @@ -324,15 +283,15 @@ </configuration> <list> <item itemvalue="Spring Boot.ServiceUserApplication" /> <item itemvalue="Spring Boot.ZuulApplication" /> <item itemvalue="Spring Boot.AppletsApplication" /> <item itemvalue="Spring Boot.CommunityBackstageApplication" /> <item itemvalue="Spring Boot.AppletsBackstageApplication" /> <item itemvalue="Spring Boot.AuthApplication" /> <item itemvalue="Spring Boot.ConfigServerApplication" /> <item itemvalue="Spring Boot.EurekaServerApplication" /> <item itemvalue="Spring Boot.ServiceDangjianApplication" /> <item itemvalue="Spring Boot.ZuulApplication" /> <item itemvalue="Spring Boot.EurekaServerApplication" /> <item itemvalue="Spring Boot.ServiceCommunityApplication" /> <item itemvalue="Spring Boot.CommunityBackstageApplication" /> <item itemvalue="Spring Boot.TimejobApplication" /> <item itemvalue="应用程序.ComActActivityServiceImpl" /> <item itemvalue="应用程序.IdCard" /> @@ -486,7 +445,7 @@ <workItem from="1616487257652" duration="6990000" /> <workItem from="1616501287620" duration="598000" /> <workItem from="1616547019982" duration="10669000" /> <workItem from="1616566015680" duration="5438000" /> <workItem from="1616566015680" duration="7999000" /> </task> <servers /> </component> @@ -523,6 +482,16 @@ <line>52</line> <option name="timeStamp" value="7" /> </line-breakpoint> <line-breakpoint enabled="true" type="java-line"> <url>file://$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java</url> <line>175</line> <option name="timeStamp" value="8" /> </line-breakpoint> <line-breakpoint enabled="true" type="java-line"> <url>file://$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java</url> <line>180</line> <option name="timeStamp" value="9" /> </line-breakpoint> </breakpoints> </breakpoint-manager> <pin-to-top-manager> springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java
@@ -23,6 +23,7 @@ import com.panzhihua.community_backstage.listen.PartyBuildingMemberExcelListen; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import javassist.expr.NewArray; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.util.ObjectUtils; @@ -35,6 +36,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; import java.util.Arrays; import java.util.Date; import java.util.List; import java.util.UUID; @@ -57,7 +59,7 @@ @Resource private UserService userService; @Value("${excel.url}") private String excelUrl="http://panzhihua.nhys.cdnhxx.com/web/%E7%A4%BE%E5%8C%BA%E5%85%9A%E5%91%98%E6%95%B0%E6%8D%AE%E5%AF%BC%E5%85%A5%E6%A8%A1%E6%9D%BF.xlsx"; private String excelUrl = "http://panzhihua.nhys.cdnhxx.com/web/%E7%A4%BE%E5%8C%BA%E5%85%9A%E5%91%98%E6%95%B0%E6%8D%AE%E5%AF%BC%E5%85%A5%E6%A8%A1%E6%9D%BF.xlsx"; // FTP 登录用户名 @Value("${ftp.username}") private String userName; @@ -81,6 +83,7 @@ log.info("社区所有党组织社区id【{}】", communityId); return partyBuildingService.listPartyOrganization(communityId); } @ApiOperation(value = "社区所有党组织列表", response = PartyOrganizationVO.class) @GetMapping("listpartyorganizationAll") public R listPartyOrganizationAll() { @@ -88,7 +91,7 @@ log.info("社区所有党组织社区id【{}】", communityId); return partyBuildingService.listPartyOrganizationAll(communityId); } @OperLog(operModul = "党支部管理", operType = 1) @ApiOperation(value = "新增党支部") @@ -110,7 +113,7 @@ } return partyBuildingService.updatePartyOrganization(partyOrganizationVO); } @OperLog(operModul = "党支部管理", operType = 3) @ApiOperation(value = "启用、禁用党支部") @PutMapping("resetpartyorganization") @@ -120,12 +123,12 @@ return R.fail("党支部id不能为空"); } Integer status = partyOrganizationVO.getStatus(); if(null==status||(status!=1&&status!=2)) { return R.fail("输入有效的状态，1：启用，2：禁用"); if (null == status || (status != 1 && status != 2)) { return R.fail("输入有效的状态，1：启用，2：禁用"); } return partyBuildingService.resetPartyOrganization(partyOrganizationVO); } @OperLog(operModul = "党支部管理", operType = 4) @ApiOperation(value = "删除党支部") @DeleteMapping("deletepartyorganization") @@ -136,7 +139,7 @@ } return partyBuildingService.deletePartyOrganization(partyOrganizationVO); } @OperLog(operModul = "党员管理", operType = 1) @ApiOperation(value = "新增党员") @PostMapping("addpartybuildingmember") @@ -170,10 +173,18 @@ @ApiOperation(value = "上传照片") @PostMapping(value = "uploadimage", consumes = "multipart/*", headers = "content-type=multipart/form-date") public R uploadImage(@RequestParam MultipartFile file, HttpServletRequest request) { String name = file.getOriginalFilename(); name= UUID.randomUUID().toString().replaceAll("-","")+".jpg"; String name = file.getOriginalFilename().toLowerCase();; List<String> formateList = Arrays.asList( "avi", "flv", "mpg", "mpeg", "mpe", "m1v", "m2v", "mpv2", "mp2v", "dat", "ts", "tp", "tpr", "pva", "pss", "mp4", "m4v", "m4p", "m4b", "3gp", "3gpp", "3g2", "3gp2", "ogg", "mov", "qt", "amr", "rm", "ram", "rmvb", "rpm"); String nameStr = name.split("\\.")[1]; if (formateList.contains(nameStr)) { name = UUID.randomUUID().toString().replaceAll("-", "") + ".mp4"; } else { name = UUID.randomUUID().toString().replaceAll("-", "") + ".jpg"; } try { SFTPUtil sftp = new SFTPUtil(userName,password,host,port); SFTPUtil sftp = new SFTPUtil(userName, password, host, port); sftp.login(); InputStream is = file.getInputStream(); sftp.uploadMore(FtpConstants.FTPFILEPATH_IDCARD, name, is); @@ -190,7 +201,7 @@ @PostMapping(value = "downloadtemplate", consumes = "multipart/*", headers = "content-type=multipart/form-date") public R downloadTemplate(@RequestParam MultipartFile file, HttpServletRequest request) { String fileName = file.getOriginalFilename(); //获取文件名 log.info("传入文件名字【{}】",fileName); log.info("传入文件名字【{}】", fileName); InputStream inputStream = null; try { inputStream = file.getInputStream(); @@ -340,7 +351,7 @@ @ApiOperation(value = "编辑党委") @PutMapping("updatepartycommittee") public R updatePartyCommittee(@RequestBody @Validated(AddGroup.class) PartyCommitteeVO partyCommitteeVO) { Long id = partyCommitteeVO.getId(); Long id = partyCommitteeVO.getId(); if (null == id || 0 == id) { return R.fail("主键不能为空"); } @@ -353,7 +364,7 @@ @ApiOperation(value = "删除党委") @DeleteMapping("deletepartycommittee") public R deletePartyCommittee(@RequestBody PartyCommitteeVO partyCommitteeVO) { Long id = partyCommitteeVO.getId(); Long id = partyCommitteeVO.getId(); if (null == id || 0 == id) { return R.fail("主键不能为空"); } @@ -377,7 +388,7 @@ partyCommitteeVO.setCreateBy(loginUserInfo.getUserId()); partyCommitteeVO.setCommunityId(loginUserInfo.getCommunityId()); Date publishAt = partyCommitteeVO.getPublishAt(); if(null==publishAt){ if (null == publishAt) { publishAt = new Date(); partyCommitteeVO.setPublishAt(publishAt); } @@ -456,9 +467,9 @@ @ApiOperation(value = "编辑服务团队人员") @PutMapping("serviceteam") public R putServiceTeam(@RequestBody ComPbServiceTeamDTO comPbServiceTeamDTO) { public R putServiceTeam(@RequestBody ComPbServiceTeamDTO comPbServiceTeamDTO) { Long id = comPbServiceTeamDTO.getId(); if (null==id||0==id) { if (null == id || 0 == id) { return R.fail("主键不能为空"); } comPbServiceTeamDTO.setCommunityId(null); @@ -467,38 +478,39 @@ @ApiOperation(value = "删除服务团队人员") @DeleteMapping("serviceteam") public R deleteServiceTeam(@RequestBody ComPbServiceTeamDTO comPbServiceTeamDTO) { public R deleteServiceTeam(@RequestBody ComPbServiceTeamDTO comPbServiceTeamDTO) { Long id = comPbServiceTeamDTO.getId(); if (null==id||0==id) { if (null == id || 0 == id) { return R.fail("主键不能为空"); } return partyBuildingService.deleteServiceTeam(comPbServiceTeamDTO); } @ApiOperation(value = "分页查询服务团队成员",response = ComPbServiceTeamVO.class) @ApiOperation(value = "分页查询服务团队成员", response = ComPbServiceTeamVO.class) @PostMapping("pageserviceteam") public R pageServiceTeam(@RequestBody PageComPbServiceTeamDTO pageComPbServiceTeamDTO) { pageComPbServiceTeamDTO.setCommunityId(this.getCommunityId()); return partyBuildingService.pageServiceTeam(pageComPbServiceTeamDTO); } @ApiOperation(value = "留言-删除") @DeleteMapping("deletemessage") public R deleteMessage(@RequestBody ComActMessageVO comActMessageVO) { return communityService.deleteMessage(comActMessageVO); } @ApiOperation(value = "批量设置留言（公开1，保密2）") @DeleteMapping("resetmessagepublic") public R resetMessagePublic(@RequestBody ResetComActMessageVO resetComActMessageVO) { return communityService.resetMessagePublic(resetComActMessageVO); } @ApiOperation(value = "分页显示社区所有的留言",response = ComActMessageVO.class) @ApiOperation(value = "分页显示社区所有的留言", response = ComActMessageVO.class) @PostMapping("pagemycommunitymessage") public R pageMyCommunityMessage (@RequestBody ComActMessageVO comActMessageVO){ public R pageMyCommunityMessage(@RequestBody ComActMessageVO comActMessageVO) { LoginUserInfoVO loginUserInfo = this.getLoginUserInfo(); Long communityId = loginUserInfo.getCommunityId(); if (null==communityId||0==communityId) { if (null == communityId || 0 == communityId) { return R.fail("用户未绑定社区"); } comActMessageVO.setCommunityId(communityId);
