springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml
@@ -23,7 +23,30 @@ </component> <component name="ChangeListManager"> <list default="true" id="8ba27629-3e5d-4f42-993e-d0c055bc9371" name="Default Changelist" comment=""> <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructAreaDistrictVO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/deploy-file/config-server.yaml.back" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngStructAreaDistrictDAO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngStructAreaDistrictDO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComMngStructAreaDistrictService.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructAreaDistrictServiceImpl.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/AdvertisingManagementApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/AdvertisingManagementApi.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/CommunityApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/CommunityApi.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/SystemManagementApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/SystemManagementApi.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/service/user/UserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/service/user/UserService.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/service/community/CommunityService.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/service/community/CommunityService.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/service/user/UserService.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/service/user/UserService.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/config_server/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/config_server/pom.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/deploy-file/config-server.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/deploy-file/config-server.yaml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/deploy-file/deploy-eurekaserver.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/deploy-file/eurekaserver.yaml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/api/AdvertisementApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/api/AdvertisementApi.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComOpsAdvService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComOpsAdvService.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComOpsAdvServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComOpsAdvServiceImpl.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java" afterDir="false" /> </list> <option name="SHOW_DIALOG" value="false" /> <option name="HIGHLIGHT_CONFLICTS" value="true" /> @@ -75,7 +98,7 @@ <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" /> <property name="WebServerToolWindowFactoryState" value="false" /> <property name="aspect.path.notification.shown" value="true" /> <property name="last_opened_file_path" value="$PROJECT_DIR$/timejob/src/main/resources" /> <property name="last_opened_file_path" value="$PROJECT_DIR$/deploy-file" /> <property name="project.structure.last.edited" value="Modules" /> <property name="project.structure.proportion" value="0.15" /> <property name="project.structure.side.proportion" value="0.2850575" /> @@ -96,11 +119,11 @@ <recent name="com.panzhihua.common.model.vos" /> </key> <key name="CopyFile.RECENT_KEYS"> <recent name="F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\deploy-file" /> <recent name="F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\timejob\src\main\resources" /> <recent name="F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common" /> <recent name="F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\service_user\src\main\java\com\panzhihua\service_user" /> <recent name="F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\zuul\src\main\resources" /> <recent name="F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\service_user\src\main\resources" /> </key> </component> <component name="RunDashboard"> @@ -408,7 +431,7 @@ <workItem from="1611019208339" duration="94460000" /> <workItem from="1611365644515" duration="33195000" /> <workItem from="1611536010905" duration="21843000" /> <workItem from="1611622682269" duration="28870000" /> <workItem from="1611622682269" duration="36544000" /> </task> <servers /> </component> @@ -432,10 +455,14 @@ <screen x="0" y="0" width="1536" height="824" /> </state> <state x="249" y="0" key="#Project_Structure/0.0.1536.824@0.0.1536.824" timestamp="1608546608273" /> <state x="574" y="118" key="#com.intellij.ide.util.MemberChooser" timestamp="1611717281377"> <state x="464" y="213" key="#com.intellij.fileTypes.FileTypeChooser" timestamp="1611735657367"> <screen x="0" y="0" width="1536" height="824" /> </state> <state x="574" y="118" key="#com.intellij.ide.util.MemberChooser/0.0.1536.824@0.0.1536.824" timestamp="1611717281377" /> <state x="464" y="213" key="#com.intellij.fileTypes.FileTypeChooser/0.0.1536.824@0.0.1536.824" timestamp="1611735657367" /> <state x="574" y="118" key="#com.intellij.ide.util.MemberChooser" timestamp="1611735096786"> <screen x="0" y="0" width="1536" height="824" /> </state> <state x="574" y="118" key="#com.intellij.ide.util.MemberChooser/0.0.1536.824@0.0.1536.824" timestamp="1611735096786" /> <state x="405" y="335" key="#com.intellij.refactoring.move.MoveHandler.SelectRefactoringDialog" timestamp="1606099594079"> <screen x="0" y="0" width="1536" height="824" /> </state> @@ -452,10 +479,10 @@ <screen x="0" y="0" width="1536" height="824" /> </state> <state x="499" y="159" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/0.0.1536.824@0.0.1536.824" timestamp="1608878808962" /> <state width="562" height="466" key="DebuggerActiveHint" timestamp="1611567329549"> <state width="562" height="466" key="DebuggerActiveHint" timestamp="1611734911266"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="562" height="466" key="DebuggerActiveHint/0.0.1536.824@0.0.1536.824" timestamp="1611567329549" /> <state width="562" height="466" key="DebuggerActiveHint/0.0.1536.824@0.0.1536.824" timestamp="1611734911266" /> <state x="93" y="93" width="1350" height="638" key="DiffContextDialog" timestamp="1609316182000"> <screen x="0" y="0" width="1536" height="824" /> </state> @@ -464,54 +491,54 @@ <screen x="0" y="0" width="1536" height="824" /> </state> <state x="549" y="167" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1610606590056" /> <state width="1031" height="417" key="GridCell.Tab.0.bottom" timestamp="1611726750835"> <state width="1031" height="488" key="GridCell.Tab.0.bottom" timestamp="1611735612423"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="417" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611726750835" /> <state width="1031" height="417" key="GridCell.Tab.0.center" timestamp="1611726750834"> <state width="1031" height="488" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611735612423" /> <state width="1031" height="488" key="GridCell.Tab.0.center" timestamp="1611735612423"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="417" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1611726750834" /> <state width="1031" height="417" key="GridCell.Tab.0.left" timestamp="1611726750834"> <state width="1031" height="488" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1611735612423" /> <state width="1031" height="488" key="GridCell.Tab.0.left" timestamp="1611735612423"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="417" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1611726750834" /> <state width="1031" height="417" key="GridCell.Tab.0.right" timestamp="1611726750834"> <state width="1031" height="488" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1611735612423" /> <state width="1031" height="488" key="GridCell.Tab.0.right" timestamp="1611735612423"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="417" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1611726750834" /> <state width="1031" height="417" key="GridCell.Tab.1.bottom" timestamp="1611726750835"> <state width="1031" height="488" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1611735612423" /> <state width="1031" height="488" key="GridCell.Tab.1.bottom" timestamp="1611735612423"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="417" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611726750835" /> <state width="1031" height="417" key="GridCell.Tab.1.center" timestamp="1611726750835"> <state width="1031" height="488" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611735612423" /> <state width="1031" height="488" key="GridCell.Tab.1.center" timestamp="1611735612423"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="417" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1611726750835" /> <state width="1031" height="417" key="GridCell.Tab.1.left" timestamp="1611726750835"> <state width="1031" height="488" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1611735612423" /> <state width="1031" height="488" key="GridCell.Tab.1.left" timestamp="1611735612423"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="417" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1611726750835" /> <state width="1031" height="417" key="GridCell.Tab.1.right" timestamp="1611726750835"> <state width="1031" height="488" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1611735612423" /> <state width="1031" height="488" key="GridCell.Tab.1.right" timestamp="1611735612423"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="417" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1611726750835" /> <state width="1031" height="417" key="GridCell.Tab.2.bottom" timestamp="1611726750835"> <state width="1031" height="488" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1611735612423" /> <state width="1031" height="488" key="GridCell.Tab.2.bottom" timestamp="1611735612424"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="417" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611726750835" /> <state width="1031" height="417" key="GridCell.Tab.2.center" timestamp="1611726750835"> <state width="1031" height="488" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611735612424" /> <state width="1031" height="488" key="GridCell.Tab.2.center" timestamp="1611735612424"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="417" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1611726750835" /> <state width="1031" height="417" key="GridCell.Tab.2.left" timestamp="1611726750835"> <state width="1031" height="488" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1611735612424" /> <state width="1031" height="488" key="GridCell.Tab.2.left" timestamp="1611735612423"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="417" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1611726750835" /> <state width="1031" height="417" key="GridCell.Tab.2.right" timestamp="1611726750835"> <state width="1031" height="488" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1611735612423" /> <state width="1031" height="488" key="GridCell.Tab.2.right" timestamp="1611735612424"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="417" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1611726750835" /> <state width="1031" height="488" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1611735612424" /> <state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1610611848124"> <screen x="0" y="0" width="1536" height="824" /> </state> springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/AdvertisingManagementApi.java
@@ -1,5 +1,6 @@ package com.panzhihua.applets_backstage.api; import com.panzhihua.common.constants.FtpConstants; import com.panzhihua.common.interfaces.OperLog; import com.panzhihua.common.model.dtos.advertisement.ComOpsAdvDTO; import com.panzhihua.common.model.dtos.advertisement.PageComOpsAdvDTO; @@ -8,14 +9,20 @@ import com.panzhihua.common.model.vos.advertisement.ComOpsAdvPosVO; import com.panzhihua.common.model.vos.advertisement.ComOpsAdvVO; import com.panzhihua.common.service.community.CommunityService; import com.panzhihua.common.utlis.SFTPUtil; import com.panzhihua.common.validated.AddGroup; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.util.ObjectUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.io.InputStream; import java.util.UUID; /** * @program: springcloud_k8s_panzhihuazhihuishequ @@ -23,6 +30,7 @@ * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2021-01-04 09:28 **/ @Slf4j @Api(tags = {"广告管理"}) @RestController @RequestMapping("/advertisingmanagement/") @@ -104,4 +112,30 @@ public R detailAdvertisement(@RequestParam("id") Long id){ return communityService.detailAdvertisement(id); } @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"; try { SFTPUtil sftp = new SFTPUtil(); sftp.login(); InputStream is = file.getInputStream(); sftp.uploadMore(FtpConstants.FTPFILEPATH_IDCARD, name, is); sftp.logout(); return R.ok(FtpConstants.HTTP_URL + "/idcard/" + name); } catch (Exception e) { log.error("上传照片失败【{}】", e.getMessage()); return R.fail(); } } @ApiOperation(value = "删除广告") @DeleteMapping("advertisement") public R deleteAdvertisement(@RequestParam("id") Long id){ return communityService.deleteAdvertisement(id); } } springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/CommunityApi.java
@@ -6,6 +6,7 @@ import com.panzhihua.common.model.dtos.community.PageComActDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComActVO; import com.panzhihua.common.model.vos.community.ComMngStructAreaDistrictVO; import com.panzhihua.common.model.vos.user.AdministratorsUserVO; import com.panzhihua.common.service.community.CommunityService; import com.panzhihua.common.service.user.UserService; @@ -31,10 +32,10 @@ private CommunityService communityService; @Resource private UserService userService; /** * 攀枝花地址json */ private String panzhihuajson="[{\"district_name\":\"仁和区\",\"city_adcode\":510400,\"district_adcode\":510411,\"province_id\":23,\"id\":2004,\"province_adcode\":510000,\"city_id\":256},{\"district_name\":\"米易县\",\"city_adcode\":510400,\"district_adcode\":510421,\"province_id\":23,\"id\":2005,\"province_adcode\":510000,\"city_id\":256},{\"district_name\":\"盐边县\",\"city_adcode\":510400,\"district_adcode\":510422,\"province_id\":23,\"id\":2006,\"province_adcode\":510000,\"city_id\":256}]"; // /** // * 攀枝花地址json // */ // private String panzhihuajson="[{\"district_name\":\"仁和区\",\"city_adcode\":510400,\"district_adcode\":510411,\"province_id\":23,\"id\":2004,\"province_adcode\":510000,\"city_id\":256},{\"district_name\":\"米易县\",\"city_adcode\":510400,\"district_adcode\":510421,\"province_id\":23,\"id\":2005,\"province_adcode\":510000,\"city_id\":256},{\"district_name\":\"盐边县\",\"city_adcode\":510400,\"district_adcode\":510422,\"province_id\":23,\"id\":2006,\"province_adcode\":510000,\"city_id\":256}]"; @ApiOperation(value = "新增社区",response = ComActVO.class) @PostMapping("community") @@ -81,11 +82,11 @@ return communityService.pageCommunity(pageComActDTO); } @ApiOperation(value = "所在地地址下拉列表") @ApiOperation(value = "所在地地址下拉列表",response = ComMngStructAreaDistrictVO.class) @PostMapping("listarea") public R listArea(){ JSONObject jsonObject=JSONObject.parseObject(panzhihuajson); return R.ok(jsonObject); Long cityAdcode=510400l; return communityService.listAreaDistrict(cityAdcode); }
@@ -6,6 +6,7 @@ import com.panzhihua.common.model.dtos.advertisement.ComOpsAdvJumpDTO; import com.panzhihua.common.model.dtos.user.PageFeedBackDTO; import com.panzhihua.common.model.vos.AppletesBackstageConfigVO; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.advertisement.ComOpsAdvJumpVO; import com.panzhihua.common.model.vos.user.*; @@ -15,6 +16,7 @@ import com.panzhihua.common.validated.AddGroup; import com.panzhihua.common.validated.PageGroup; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import org.springframework.util.ObjectUtils; import org.springframework.validation.annotation.Validated; @@ -92,21 +94,57 @@ return userService.pageUserBackstage(administratorsUserVO); } @ApiOperation(value = "新增角色") @PostMapping("role") // @ApiOperation(value = "新增角色") // @PostMapping("role") // @OperLog(operModul = "角色管理",operType = 1) // public R addRoleBackstage(@RequestBody RoleVO roleVO){ // String roleName = roleVO.getRoleName(); // if (ObjectUtils.isEmpty(roleName)) { // return R.fail("角色名字不能为空"); // } // roleVO.setCommunityId(0l); // Long userId = this.getUserId(); // roleVO.setCreateBy(userId); // roleVO.setStatus(0); // HanyuPinyinHelper hanyuPinyinHelper = new HanyuPinyinHelper() ; // roleVO.setRoleKey(hanyuPinyinHelper.toHanyuPinyin(roleName)); // return userService.addRoleBackstage(roleVO); // } @ApiOperation(value = "新增角色-设置角色的权限") @PostMapping("menu") @OperLog(operModul = "角色管理",operType = 1) public R addRoleBackstage(@RequestBody RoleVO roleVO){ String roleName = roleVO.getRoleName(); public R addMenuRole(@RequestBody @Validated MenuRoleVO menuRoleVO){ RoleVO roleVO=new RoleVO(); String roleName = menuRoleVO.getRoleName(); if (ObjectUtils.isEmpty(roleName)) { return R.fail("角色名字不能为空"); } roleVO.setCommunityId(0l); Long userId = this.getUserId(); LoginUserInfoVO loginUserInfo = this.getLoginUserInfo(); Long userId = loginUserInfo.getUserId(); Long communityId = 0l; roleVO.setRoleName(roleName); roleVO.setCommunityId(communityId); roleVO.setCreateBy(userId); roleVO.setStatus(0); HanyuPinyinHelper hanyuPinyinHelper = new HanyuPinyinHelper() ; roleVO.setRoleKey(hanyuPinyinHelper.toHanyuPinyin(roleName)); return userService.addRoleBackstage(roleVO); R r = userService.addRoleBackstage(roleVO); if (R.isOk(r)) { Long roleId =Long.parseLong(r.getData().toString()); menuRoleVO.setRoleId(roleId); menuRoleVO.setCommunityId(communityId); return userService.putMenuRole(menuRoleVO); } return r; } @ApiOperation(value = "获取角色的权限配置列表",response = SysMenuVO.class) @GetMapping("listmenurole") @ApiImplicitParam(name = "roleId",value = "角色id") public R listMenuBackstageByRole(@RequestParam("roleId") Long roleId){ return userService.listMenuBackstageByRole(roleId); } @ApiOperation(value = "删除角色") @@ -188,4 +226,10 @@ public R detailFeedback(@RequestParam("id") Long id){ return userService.detailFeedback(id); } @ApiOperation(value = "删除意见反馈") @DeleteMapping("feedback") public R deleteFeedback(@RequestParam("id") Long id){ return userService.deleteFeedback(id); } } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructAreaDistrictVO.java
New file @@ -0,0 +1,36 @@ package com.panzhihua.common.model.vos.community; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 县区 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2021-01-27 15:05 **/ @Data @ApiModel("区县") public class ComMngStructAreaDistrictVO { @ApiModelProperty("自增 id") private Integer id; @ApiModelProperty("区县名称") private String districtName; @ApiModelProperty("区县行政区划代码") private Integer districtAdcode; @ApiModelProperty("城市行政区划代码") private Integer cityAdcode; @ApiModelProperty("城市 id") private Integer cityId; @ApiModelProperty("省份行政区划代码") private Integer provinceAdcode; @ApiModelProperty("省份 id") private Integer provinceId; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -824,4 +824,20 @@ */ @PostMapping("detailadvertisement") R detailAdvertisement(@RequestParam("id") Long id); /** * 删除广告 * @param id 主键 * @return 删除结果 */ @PostMapping("deleteadvertisement") R deleteAdvertisement(@RequestParam("id")Long id); /** * 查询城市下属所有地区列表 * @param cityAdcode 城市地址编码 * @return 地区列表 */ @PostMapping("listareadistrict") R listAreaDistrict(@RequestParam("cityAdcode") Long cityAdcode); } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
@@ -492,4 +492,12 @@ */ @PostMapping("putuserlastlogintime") R putUserLastLoginTime(@RequestParam("userId")Long userId); /** * 删除意见反馈 * @param id 主键 * @return 删除结果 */ @PostMapping("deletefeedback") R deleteFeedback(@RequestParam("id")Long id); } springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/community/ComMngStructAreaDistrictVO.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/service/community/CommunityService.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/service/user/UserService.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/config_server/pom.xml
@@ -67,8 +67,8 @@ <artifactId>docker-maven-plugin</artifactId> <version>1.2.0</version> <configuration> <imageName>registry.cn-hangzhou.aliyuncs.com/wooddeep/config-server:v0.3</imageName> <serverId>my-docker-registry</serverId> <imageName>config-server:v1</imageName> <serverId></serverId> <baseImage>java</baseImage> <entryPoint>["java", "-jar", "/${project.build.finalName}.jar"]</entryPoint> <resources> springcloud_k8s_panzhihuazhihuishequ/deploy-file/config-server.yaml
@@ -1,42 +1,60 @@ --- apiVersion: apps/v1 kind: Deployment metadata: name: config-server spec: selector: matchLabels: app: springcloud-config-server app: config-server replicas: 1 template: metadata: labels: app: springcloud-config-server spec: containers: - name: config-server-instance image: registry.cn-hangzhou.aliyuncs.com/wooddeep/config-server:v0.3 env: - name: EUREKA_URL value: eureka-server ports: - containerPort: 8765 metadata: labels: app: config-server spec: containers: - name: config-server-instance image: config-server:v1 ports: - containerPort: 8193 env: - name: EUREKA_URL value: eureka-server --- kind: Service apiVersion: v1 kind: Service metadata: name: config-server spec: selector: app: springcloud-config-server ports: - protocol: TCP port: 8765 targetPort: 8765 #type: NodePort - port: 8193 targetPort: 8193 name: http nodePort: 31072 selector: app: config-server type: NodePort
New file @@ -0,0 +1,40 @@ --- apiVersion: apps/v1 kind: Deployment metadata: name: config-server spec: selector: matchLabels: app: springcloud-config-server replicas: 1 template: metadata: labels: app: springcloud-config-server spec: containers: - name: config-server-instance image: registry.cn-hangzhou.aliyuncs.com/wooddeep/config-server:v0.3 env: - name: EUREKA_URL value: eureka-server ports: - containerPort: 8765 --- kind: Service apiVersion: v1 metadata: name: config-server spec: selector: app: springcloud-config-server ports: - protocol: TCP port: 8765 targetPort: 8765 #type: NodePort springcloud_k8s_panzhihuazhihuishequ/deploy-file/eurekaserver.yaml
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/AdvertisementApi.java
@@ -108,4 +108,14 @@ public R detailAdvertisement(@RequestParam("id") Long id){ return comOpsAdvService.detailAdvertisement(id); } /** * 删除广告 * @param id 主键 * @return 删除结果 */ @PostMapping("deleteadvertisement") public R deleteAdvertisement(@RequestParam("id")Long id){ return comOpsAdvService.deleteAdvertisement(id); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
@@ -59,6 +59,8 @@ private ComMngStructOtherBuildService comMngStructOtherBuildService; @Resource private ComMngVolunteerMngService comMngVolunteerMngService; @Resource private ComMngStructAreaDistrictService comMngStructAreaDistrictService; /** * 新增社区活动 @@ -1137,7 +1139,15 @@ return comActEasyPhotoService.addComActEasyPhotoComment(comActEasyPhotoCommentDTO); } /** * 查询城市下属所有地区列表 * @param cityAdcode 城市地址编码 * @return 地区列表 */ @PostMapping("listareadistrict") public R listAreaDistrict(@RequestParam("cityAdcode") Long cityAdcode){ return comMngStructAreaDistrictService.listAreaDistrict(cityAdcode); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngStructAreaDistrictDAO.java
New file @@ -0,0 +1,16 @@ package com.panzhihua.service_community.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.panzhihua.service_community.model.dos.ComMngStructAreaDistrictDO; import org.apache.ibatis.annotations.Mapper; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 区县 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2021-01-27 15:00 **/ @Mapper public interface ComMngStructAreaDistrictDAO extends BaseMapper<ComMngStructAreaDistrictDO> { } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngStructAreaDistrictDO.java
New file @@ -0,0 +1,57 @@ package com.panzhihua.service_community.model.dos; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import java.io.Serializable; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 区县 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2021-01-27 14:58 **/ @Data @TableName(value = "com_mng_struct_area_district") public class ComMngStructAreaDistrictDO implements Serializable { private static final long serialVersionUID = 1L; /** * 自增 id */ @TableId(type= IdType.AUTO) private Integer id; /** * 区县名称 */ private String districtName; /** * 区县行政区划代码 */ private Integer districtAdcode; /** * 城市行政区划代码 */ private Integer cityAdcode; /** * 城市 id */ private Integer cityId; /** * 省份行政区划代码 */ private Integer provinceAdcode; /** * 省份 id */ private Integer provinceId; } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngStructAreaDistrictService.java
New file @@ -0,0 +1,18 @@ package com.panzhihua.service_community.service; import com.panzhihua.common.model.vos.R; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 地址 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2021-01-27 15:01 **/ public interface ComMngStructAreaDistrictService { /** * 查询城市下属所有地区列表 * @param cityAdcode 城市地址编码 * @return 地区列表 */ R listAreaDistrict(Long cityAdcode); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComOpsAdvService.java
@@ -62,4 +62,10 @@ * @return 广告内容 */ R detailAdvertisement(Long id); /** * 删除广告 * @param id 主键 * @return 删除结果 */ R deleteAdvertisement(Long id); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructAreaDistrictServiceImpl.java
New file @@ -0,0 +1,47 @@ package com.panzhihua.service_community.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComMngStructAreaDistrictVO; import com.panzhihua.service_community.dao.ComMngStructAreaDistrictDAO; import com.panzhihua.service_community.model.dos.ComMngStructAreaDistrictDO; import com.panzhihua.service_community.service.ComMngStructAreaDistrictService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 地址 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2021-01-27 15:02 **/ @Service public class ComMngStructAreaDistrictServiceImpl implements ComMngStructAreaDistrictService { @Resource private ComMngStructAreaDistrictDAO comMngStructAreaDistrictDAO; /** * 查询城市下属所有地区列表 * * @param cityAdcode 城市地址编码 * @return 地区列表 */ @Override public R listAreaDistrict(Long cityAdcode) { List<ComMngStructAreaDistrictDO> comMngStructAreaDistrictDOS = comMngStructAreaDistrictDAO.selectList(new QueryWrapper<ComMngStructAreaDistrictDO>().lambda().eq(ComMngStructAreaDistrictDO::getCityAdcode, cityAdcode)); List<ComMngStructAreaDistrictVO>comMngStructAreaDistrictVOS=new ArrayList<>(); if (!ObjectUtils.isEmpty(comMngStructAreaDistrictDOS)) { comMngStructAreaDistrictDOS.forEach(comMngStructAreaDistrictDO -> { ComMngStructAreaDistrictVO comMngStructAreaDistrictVO=new ComMngStructAreaDistrictVO(); BeanUtils.copyProperties(comMngStructAreaDistrictDO,comMngStructAreaDistrictVO); comMngStructAreaDistrictVOS.add(comMngStructAreaDistrictVO); }); } return R.ok(comMngStructAreaDistrictVOS); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComOpsAdvServiceImpl.java
@@ -79,25 +79,37 @@ } // 查询所有正在使用的跳转内容id List<Long> ids=comOpsAdvDAO.selectAllBeUsedContent(); List<Long> notDeleteIds=new ArrayList<>(); List<Long> collect = comOpsAdvJumpDTOS.stream().map(comOpsAdvJumpDTO -> comOpsAdvJumpDTO.getId()).collect(Collectors.toList()); if (!ObjectUtils.isEmpty(ids)) { ids.forEach(aLong -> { if (!collect.contains(aLong)) { ComOpsAdvJumpDO comOpsAdvJumpDO = comOpsAdvJumpDAO.selectById(aLong); String jumpContent = comOpsAdvJumpDO.getJumpContent(); throw new ServiceException(jumpContent+" 已经在使用无法删除"); if (!ObjectUtils.isEmpty(comOpsAdvJumpDO)) { String jumpContent = comOpsAdvJumpDO.getJumpContent(); throw new ServiceException(jumpContent+" 已经在使用无法删除"); } }else{ notDeleteIds.add(aLong); } }); } comOpsAdvJumpDAO.delete(null); if (!ObjectUtils.isEmpty(notDeleteIds)) { comOpsAdvJumpDAO.delete(new QueryWrapper<ComOpsAdvJumpDO>().lambda().notIn(ComOpsAdvJumpDO::getId,notDeleteIds)); }else{ comOpsAdvJumpDAO.delete(null); } comOpsAdvJumpDTOS.forEach(comOpsAdvJumpDTO -> { ComOpsAdvJumpDO comOpsAdvJumpDO=new ComOpsAdvJumpDO(); String jumpContent = comOpsAdvJumpDTO.getJumpContent(); if (ObjectUtils.isEmpty(jumpContent)) { throw new ServiceException("广告跳转内容不能为空"); Long id = comOpsAdvJumpDTO.getId(); if (!ids.contains(id)) { ComOpsAdvJumpDO comOpsAdvJumpDO=new ComOpsAdvJumpDO(); String jumpContent = comOpsAdvJumpDTO.getJumpContent(); if (ObjectUtils.isEmpty(jumpContent)) { throw new ServiceException("广告跳转内容不能为空"); } comOpsAdvJumpDO.setJumpContent(jumpContent); comOpsAdvJumpDAO.insert(comOpsAdvJumpDO); } comOpsAdvJumpDO.setJumpContent(jumpContent); comOpsAdvJumpDAO.insert(comOpsAdvJumpDO); }); return R.ok(); } @@ -225,4 +237,19 @@ ComOpsAdvVO comOpsAdvVO=comOpsAdvDAO.detailAdvertisement(id); return R.ok(comOpsAdvVO); } /** * 删除广告 * * @param id 主键 * @return 删除结果 */ @Override public R deleteAdvertisement(Long id) { int delete = comOpsAdvDAO.deleteById(id); if (delete>0) { return R.ok(); } return R.fail(); } } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
@@ -516,4 +516,14 @@ return userService.putUserLastLoginTime(userId); } /** * 删除意见反馈 * @param id 主键 * @return 删除结果 */ @PostMapping("deletefeedback") public R deleteFeedback(@RequestParam("id")Long id){ return userService.deleteFeedback(id); } } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
@@ -316,4 +316,10 @@ * @return 维护结果 */ R putUserLastLoginTime(Long userId); /** * 删除意见反馈 * @param id 主键 * @return 删除结果 */ R deleteFeedback(Long id); } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -1324,6 +1324,21 @@ return R.fail(); } /** * 删除意见反馈 * * @param id 主键 * @return 删除结果 */ @Override public R deleteFeedback(Long id) { int delete = sysUserFeedbackDAO.deleteById(id); if (delete>0) { return R.ok(); } return R.fail(); } public static void main(String[] args) { String encode = new BCryptPasswordEncoder().encode("lbsq123456");
