springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/LoginApi.java
@@ -40,6 +40,9 @@ import lombok.extern.slf4j.Slf4j; import me.chanjar.weixin.common.error.WxErrorException; import java.util.HashMap; import java.util.Map; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 登录 @@ -317,10 +320,22 @@ @GetMapping("uu/getQRCode") public R uuLogin(@RequestParam("couponId") String couponId) { try { WxMaQrcodeService qrCodeService = wxMaConfiguration.getMaService("wx98d62711dfbd8425").getQrcodeService(); byte[] bytes = qrCodeService.createWxaCodeUnlimitBytes("couponId=" + couponId, //i小懒 WxMaQrcodeService wsCodeService = wxMaConfiguration.getMaService("wx98d62711dfbd8425").getQrcodeService(); byte[] bytes = wsCodeService.createWxaCodeUnlimitBytes("couponId=" + couponId, "/pages/user/getCoupon/getCoupon", true, "release", 30, true, null, false); return R.ok(String.format("data:image/png;base64,%s", Base64.encode(bytes))); String res = String.format("data:image/png;base64,%s", Base64.encode(bytes)); //花城 WxMaQrcodeService uuCodeService = wxMaConfiguration.getMaService("wx118de8a734d269f0").getQrcodeService(); byte[] hcBytes = uuCodeService.createWxaCodeUnlimitBytes("couponId=" + couponId, "/packageD/pages/user/getCoupon/getCoupon", true, "release", 30, true, null, false); String hcRes = String.format("data:image/png;base64,%s", Base64.encode(hcBytes)); Map<String,String> retMap = new HashMap<>(); retMap.put("ixiaolan",res); retMap.put("huacheng",hcRes); return R.ok(retMap); } catch (Exception e) { log.error("generate QRCode failed:" + e.getMessage()); return R.fail("generate QRCode failed"); springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/LoginApi.java
@@ -2,6 +2,7 @@ import javax.annotation.Resource; import com.panzhihua.common.interfaces.OperLog; import org.springframework.util.ObjectUtils; import org.springframework.web.bind.annotation.*; @@ -30,6 +31,7 @@ @ApiOperation(value = "登录") @PostMapping("login") @OperLog(operModul = "运营后台登录",operType = 0,businessType = "登录") public R login(@RequestBody LoginBody loginBody) { String account = loginBody.getAccount(); String password = loginBody.getPassword(); @@ -44,6 +46,7 @@ @ApiOperation(value = "登出") @PostMapping("logout") @OperLog(operModul = "运营后台登录",operType = 0,businessType = "登出") public R login() { String token = this.getToken(); if (ObjectUtils.isEmpty(token)) { springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/impl/LoginServiceImpl.java
@@ -1,11 +1,16 @@ package com.panzhihua.auth.service.impl; import java.util.Date; import java.util.concurrent.TimeUnit; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComActVO; import com.panzhihua.common.model.vos.user.SysOperLogVO; import com.panzhihua.common.service.user.UserService; import com.panzhihua.common.utlis.IPUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.data.redis.core.ValueOperations; @@ -21,6 +26,9 @@ import com.panzhihua.common.model.vos.LoginReturnsVO; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.utlis.JWTTokenUtil; import org.springframework.web.context.request.RequestAttributes; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; import static java.util.Objects.nonNull; @@ -36,6 +44,8 @@ private AuthenticationManager authenticationManager; @Autowired private StringRedisTemplate redisTemplate; @Resource private UserService userService; /** * 微信小程序登录 @@ -120,6 +130,21 @@ loginReturnVO.setLat(comActVO.getLat()); loginReturnVO.setLng(comActVO.getLng()); } //保存登录日志 HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); SysOperLogVO operlog = new SysOperLogVO(); operlog.setTitle("登录操作"); // 操作模块 operlog.setBusinessType(1); // 操作类型 operlog.setMethod("com.panzhihua.community_backstage.api.LoginApi.login"); // 请求方法 operlog.setAccount(loginUser.getAccount()); operlog.setOperName(loginUser.getName()); // 请求用户名称 operlog.setOperIp(IPUtil.getIpAddress(request)); // 请求IP operlog.setOperUrl(request.getRequestURI()); // 请求URI operlog.setRequestMethod(request.getMethod()); operlog.setOperLocation(IPUtil.getIpBelongAddress(request)); operlog.setOperTime(new Date()); // 创建时间 operlog.setCommunityId(loginUser.getCommunityId()); userService.addOperLog(operlog); return loginReturnVO; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/IPUtil.java
@@ -1,65 +1,67 @@ package com.panzhihua.common.utlis; import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; import javax.servlet.http.HttpServletRequest; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; import java.net.HttpURLConnection; import java.net.URL; import javax.servlet.http.HttpServletRequest; import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; /** * @ClassName: IPUtil * @version 1.0 * @Desc: Ip工具类 * @author huaping hu * @version 1.0 * @ClassName: IPUtil * @Desc: Ip工具类 * @date 2016年6月1日下午5:26:56 * @history v1.0 * */ @Slf4j public class IPUtil { /** * * 描述:获取IP地址 * * @param request * @return * @author huaping hu * @date 2016年6月1日下午5:25:44 * @param request * @return */ public static String getIpAddress(HttpServletRequest request) { if (request == null) { return "unknown"; } String ip = request.getHeader("x-forwarded-for"); if (ip == null || ip.length() == 0 || "nuknown".equalsIgnoreCase(ip)) { if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { ip = request.getHeader("Proxy-Client-IP"); } if (ip == null || ip.length() == 0 || "nuknown".equalsIgnoreCase(ip)) { if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { ip = request.getHeader("X-Forwarded-For"); } if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { ip = request.getHeader("WL-Proxy-Client-IP"); } if (ip == null || ip.length() == 0 || "nuknown".equalsIgnoreCase(ip)) { if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { ip = request.getHeader("X-Real-IP"); } if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { ip = request.getRemoteAddr(); } return ip; return "0:0:0:0:0:0:0:1".equals(ip) ? "127.0.0.1" : ip; } /** * * 描述:获取IP+[IP所属地址] * * @author huaping hu * @date 2016年6月1日下午6:01:09 * @param request * @return * @author huaping hu * @date 2016年6月1日下午6:01:09 */ public static String getIpBelongAddress(HttpServletRequest request) { @@ -70,13 +72,12 @@ } /** * * 描述:获取IP所属地址 * * @author huaping hu * @date 2016年6月1日下午5:59:43 * @param ip * @return * @author huaping hu * @date 2016年6月1日下午5:59:43 */ public static String getIPbelongAddress(String ip) { @@ -98,13 +99,12 @@ } /** * * 描述:获取Ip所属地址 * * @author huaping hu * @date 2016年6月1日下午5:38:55 * @param urlStr * @return * @author huaping hu * @date 2016年6月1日下午5:38:55 */ public static String call(String urlStr) { @@ -130,13 +130,12 @@ } /** * * 描述:将InputStream转换成String * * @author huaping hu * @date 2016年6月1日下午5:51:53 * @param is * @return * @author huaping hu * @date 2016年6月1日下午5:51:53 */ public static String streamConvertToSting(InputStream is) { springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BuildingApi.java
@@ -14,6 +14,7 @@ import com.alibaba.excel.write.metadata.WriteSheet; import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy; import com.alibaba.fastjson.JSONArray; import com.panzhihua.common.interfaces.OperLog; import com.panzhihua.common.model.dtos.community.building.admin.*; import com.panzhihua.common.model.vos.community.ComMngPopulationImportErrorVO; import com.panzhihua.common.model.vos.community.ComMngVillageVO; @@ -73,6 +74,7 @@ @ApiOperation(value = "excel导入楼栋信息--注:以前的接口,不需要对接") @PostMapping(value = "/import", consumes = "multipart/*", headers = "content-type=multipart/form-date") @OperLog(operModul = "房屋信息管理-导入楼栋信息", operType = 0, businessType = "导入楼栋信息") public R downloadPopulationTemplate(@RequestParam MultipartFile file) { InputStream inputStream; try { @@ -146,6 +148,7 @@ @ApiOperation(value = "添加单元") @PostMapping("/add/unit") @OperLog(operModul = "房屋信息管理-添加单元", operType = 1, businessType = "添加单元") public R addUnit(@RequestBody AddBuildingUnitDto addBuildingUnitDto) { // 获取登陆用户绑定社区id Long communityId = this.getLoginUserInfo().getCommunityId(); @@ -159,6 +162,7 @@ @ApiOperation(value = "修改单元") @PostMapping("/edit/unit") @OperLog(operModul = "房屋信息管理-修改单元", operType = 2, businessType = "修改单元") public R editUnit(@RequestBody EditBuildingUnitDto editBuildingUnitDto) { // 获取登陆用户绑定社区id Long communityId = this.getLoginUserInfo().getCommunityId(); @@ -331,6 +335,7 @@ @ApiOperation("删除楼栋") @GetMapping("/delete") @OperLog(operModul = "房屋信息管理-删除", operType = 3, businessType = "删除") public R delete(@RequestParam("id")Long id){ return communityService.buildingDelete(id); } springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java
@@ -155,6 +155,7 @@ //@OperLog(operModul = "党支部管理", operType = 1) @ApiOperation(value = "新增党支部") @PostMapping("addpartyorganization") @OperLog(operModul = "报道党员管理-新增党支部", operType = 1, businessType = "新增党支部") public R addPartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO) { Long communityId = this.getCommunityId(); partyOrganizationVO.setCommunityId(communityId); @@ -165,6 +166,7 @@ //@OperLog(operModul = "党支部管理", operType = 2) @ApiOperation(value = "编辑党支部") @PostMapping("updatepartyorganization") @OperLog(operModul = "报道党员管理-编辑党支部", operType = 2, businessType = "编辑党支部") public R updatePartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO) { Long id = partyOrganizationVO.getId(); if (null == id || 0 == id) { springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingWestApi.java
@@ -139,7 +139,7 @@ return partyBuildingWestService.getPbOrgAllList(partyOrganizationVO); } @OperLog(operModul = "党支部管理", operType = 1) @OperLog(operModul = "党支部管理", operType = 1,businessType = "新增党支部") @ApiOperation(value = "新增党支部") @PostMapping("addpartyorganization") public R addPartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO) { @@ -149,7 +149,7 @@ return r; } @OperLog(operModul = "党支部管理", operType = 2) @OperLog(operModul = "党支部管理", operType = 2,businessType = "编辑党支部") @ApiOperation(value = "编辑党支部") @PostMapping("updatepartyorganization") public R updatePartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO) { @@ -160,7 +160,7 @@ return partyBuildingWestService.updatePartyOrganization(partyOrganizationVO); } @OperLog(operModul = "党支部管理", operType = 3) @OperLog(operModul = "党支部管理", operType = 3,businessType = "启用、禁用党支部") @ApiOperation(value = "启用、禁用党支部") @PutMapping("resetpartyorganization") public R resetPartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO) { @@ -175,7 +175,7 @@ return partyBuildingWestService.resetPartyOrganization(partyOrganizationVO); } @OperLog(operModul = "党支部管理", operType = 4) @OperLog(operModul = "党支部管理", operType = 3,businessType = "删除党支部") @ApiOperation(value = "删除党支部") @DeleteMapping("deletepartyorganization") public R deletePartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO) { @@ -186,7 +186,7 @@ return partyBuildingWestService.deletePartyOrganization(partyOrganizationVO); } @OperLog(operModul = "党员管理", operType = 1) @OperLog(operModul = "党员管理", operType = 1,businessType = "新增党员") @ApiOperation(value = "新增党员") @PostMapping("addpartybuildingmember") public R addPartyBuildingMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO) { @@ -199,7 +199,7 @@ return r; } @OperLog(operModul = "党员管理", operType = 2) @OperLog(operModul = "党员管理", operType = 2,businessType = "编辑党员") @ApiOperation(value = "编辑党员") @PutMapping("updatepartybuildingmember") public R updatePartyBuildingMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO) { @@ -459,7 +459,7 @@ return userService.listIdentity(communityId); } @OperLog(operModul = "党委管理", operType = 1) @OperLog(operModul = "党委管理-新增", operType = 1) @ApiOperation(value = "新增党委") @PostMapping("addpartycommittee") public R addPartyCommittee(@RequestBody @Validated(AddGroup.class) PartyCommitteeVO partyCommitteeVO) { @@ -472,7 +472,7 @@ return r; } @OperLog(operModul = "党委管理", operType = 2) @OperLog(operModul = "党委管理-编辑", operType = 2) @ApiOperation(value = "编辑党委") @PutMapping("updatepartycommittee") public R updatePartyCommittee(@RequestBody @Validated(AddGroup.class) PartyCommitteeVO partyCommitteeVO) { @@ -485,7 +485,7 @@ return partyBuildingWestService.updatePartyCommittee(partyCommitteeVO); } @OperLog(operModul = "党委管理", operType = 3) @OperLog(operModul = "党委管理-删除", operType = 3) @ApiOperation(value = "删除党委") @DeleteMapping("deletepartycommittee") public R deletePartyCommittee(@RequestBody PartyCommitteeVO partyCommitteeVO) { springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/LoginApi.java
@@ -77,7 +77,7 @@ @OperLog(operModul="用户登出",operType = 1) @ApiOperation(value = "用户登出") @PostMapping("logout") public R updateUserWeiXinPhone() { public R logout() { String token = this.getToken(); boolean empty2 = ObjectUtils.isEmpty(token); if (empty2) { springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/PopulationApi.java
@@ -1,23 +1,5 @@ package com.panzhihua.community_backstage.api; import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; import java.util.List; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import com.panzhihua.common.exceptions.ServiceException; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.data.redis.core.ValueOperations; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import com.alibaba.excel.EasyExcel; import com.alibaba.excel.ExcelWriter; import com.alibaba.excel.write.metadata.WriteSheet; @@ -27,6 +9,8 @@ import com.panzhihua.common.constants.Constants; import com.panzhihua.common.controller.BaseController; import com.panzhihua.common.enums.*; import com.panzhihua.common.exceptions.ServiceException; import com.panzhihua.common.interfaces.OperLog; import com.panzhihua.common.listen.*; import com.panzhihua.common.model.dtos.community.*; import com.panzhihua.common.model.vos.LoginUserInfoVO; @@ -40,10 +24,24 @@ import com.panzhihua.common.utlis.SFTPUtil; import com.panzhihua.common.utlis.StringUtils; import com.panzhihua.community_backstage.excel.CustomSheetWriteHandler; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.data.redis.core.ValueOperations; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; import java.util.List; @Slf4j @Api(tags = {"社区管理/基础数据库/实有人口"}) @@ -91,6 +89,7 @@ @ApiOperation(value = "excel导入实有人口") @PostMapping(value = "/serve/import", consumes = "multipart/*", headers = "content-type=multipart/form-date") @OperLog(operModul = "居民信息管理-实有人口导入", operType = 0, businessType = "实有人口导入") public R downloadPopulationTemplate(@RequestParam MultipartFile file, HttpServletRequest request) { // 获取文件名 String fileName = file.getOriginalFilename(); @@ -132,6 +131,7 @@ @ApiOperation(value = "excel导入吸毒人员") @PostMapping(value = "/serve/importDrug", consumes = "multipart/*", headers = "content-type=multipart/form-date") @OperLog(operModul = "居民信息管理-吸毒人员导入", operType = 0, businessType = "吸毒人员导入") public R importDrug(@RequestParam MultipartFile file, HttpServletRequest request) { // 获取文件名 String fileName = file.getOriginalFilename(); @@ -151,6 +151,7 @@ @ApiOperation(value = "excel导入社区矫正人员") @PostMapping(value = "/serve/importCorrect", consumes = "multipart/*", headers = "content-type=multipart/form-date") @OperLog(operModul = "居民信息管理-社区矫正人员导入", operType = 0, businessType = "社区矫正人员导入") public R importCorrect(@RequestParam MultipartFile file, HttpServletRequest request) { // 获取文件名 String fileName = file.getOriginalFilename(); @@ -171,6 +172,7 @@ @ApiOperation(value = "excel导入重精人员") @PostMapping(value = "/serve/importMajor", consumes = "multipart/*", headers = "content-type=multipart/form-date") @OperLog(operModul = "居民信息管理-重精人员导入", operType = 0, businessType = "重精人员导入") public R importMajor(@RequestParam MultipartFile file, HttpServletRequest request) { // 获取文件名 String fileName = file.getOriginalFilename(); @@ -190,6 +192,7 @@ @ApiOperation(value = "excel导入邪教人员") @PostMapping(value = "/serve/importCult", consumes = "multipart/*", headers = "content-type=multipart/form-date") @OperLog(operModul = "居民信息管理-邪教人员导入", operType = 0, businessType = "邪教人员导入") public R importCult(@RequestParam MultipartFile file, HttpServletRequest request) { // 获取文件名 String fileName = file.getOriginalFilename(); @@ -210,6 +213,7 @@ @ApiOperation(value = "excel导入刑释人员") @PostMapping(value = "/serve/importRehabilitation", consumes = "multipart/*", headers = "content-type=multipart/form-date") @OperLog(operModul = "居民信息管理-刑释人员导入", operType = 0, businessType = "刑释人员导入") public R importRehabilitation(@RequestParam MultipartFile file, HttpServletRequest request) { // 获取文件名 String fileName = file.getOriginalFilename(); @@ -230,6 +234,7 @@ @ApiOperation(value = "excel导入重点上访人员") @PostMapping(value = "/serve/importKey", consumes = "multipart/*", headers = "content-type=multipart/form-date") @OperLog(operModul = "居民信息管理-重点上访人员导入", operType = 0, businessType = "重点上访人员导入") public R importKey(@RequestParam MultipartFile file, HttpServletRequest request) { // 获取文件名 String fileName = file.getOriginalFilename(); @@ -250,6 +255,7 @@ @ApiOperation(value = "excel导入服刑人员") @PostMapping(value = "/serve/importSentence", consumes = "multipart/*", headers = "content-type=multipart/form-date") @OperLog(operModul = "居民信息管理-服刑人员导入", operType = 0, businessType = "服刑人员导入") public R importSentence(@RequestParam MultipartFile file, HttpServletRequest request) { // 获取文件名 String fileName = file.getOriginalFilename(); @@ -271,6 +277,7 @@ @ApiOperation(value = "excel导入退役军人") @PostMapping(value = "/serve/importVeterans", consumes = "multipart/*", headers = "content-type=multipart/form-date") @OperLog(operModul = "居民信息管理-退役军人导入", operType = 0, businessType = "退役军人导入") public R importVeterans(@RequestParam MultipartFile file, HttpServletRequest request) { // 获取文件名 String fileName = file.getOriginalFilename(); @@ -292,6 +299,7 @@ @ApiOperation(value = "excel导入残疾人") @PostMapping(value = "/serve/importDisability", consumes = "multipart/*", headers = "content-type=multipart/form-date") @OperLog(operModul = "居民信息管理-残疾人导入", operType = 0, businessType = "残疾人导入") public R importDisability(@RequestParam MultipartFile file, HttpServletRequest request) { // 获取文件名 String fileName = file.getOriginalFilename(); @@ -313,6 +321,7 @@ @ApiOperation(value = "excel导入低保户") @PostMapping(value = "/serve/importLowSecurity", consumes = "multipart/*", headers = "content-type=multipart/form-date") @OperLog(operModul = "居民信息管理-低保户导入", operType = 0, businessType = "低保户导入") public R importLowSecurity(@RequestParam MultipartFile file, HttpServletRequest request) { // 获取文件名 String fileName = file.getOriginalFilename(); @@ -334,6 +343,7 @@ @ApiOperation(value = "excel导入高龄老人") @PostMapping(value = "/serve/importElder", consumes = "multipart/*", headers = "content-type=multipart/form-date") @OperLog(operModul = "居民信息管理-高龄老人导入", operType = 0, businessType = "高龄老人导入") public R importElder(@RequestParam MultipartFile file, HttpServletRequest request) { // 获取文件名 String fileName = file.getOriginalFilename(); @@ -355,6 +365,7 @@ @ApiOperation(value = "excel导入养老金人员") @PostMapping(value = "/serve/importPension", consumes = "multipart/*", headers = "content-type=multipart/form-date") @OperLog(operModul = "居民信息管理-养老金人员导入", operType = 0, businessType = "养老金人员导入") public R importPension(@RequestParam MultipartFile file, HttpServletRequest request) { // 获取文件名 String fileName = file.getOriginalFilename(); @@ -382,6 +393,7 @@ */ @ApiOperation(value = "excel-确认导入实有人口") @PostMapping(value = "/import/confirm", consumes = "multipart/*", headers = "content-type=multipart/form-date") @OperLog(operModul = "居民信息管理-实有人口导入", operType = 0, businessType = "实有人口导入") public R listSavePopulationConfirm(@RequestParam MultipartFile file, HttpServletRequest request) { // 获取文件名 String fileName = file.getOriginalFilename(); @@ -422,6 +434,7 @@ @ApiOperation(value = "编辑实有人口") @PostMapping(value = "/edit") @OperLog(operModul = "居民信息管理-编辑", operType = 2, businessType = "编辑") public R editPopulationInfo(@RequestBody ComMngPopulationEditDTO populationEditDTO) { LoginUserInfoVO loginUserInfo = getLoginUserInfo(); return communityService.editPopulation(populationEditDTO, loginUserInfo.getCommunityId()); @@ -1230,6 +1243,7 @@ @ApiOperation(value = "批量删除实有人口") @PostMapping("/delete") @OperLog(operModul = "居民信息管理-批量删除实有人口", operType = 3, businessType = "批量删除实有人口") public R deletePopulations(@RequestBody List<Long> ids) { return communityService.deletePopulations(ids,this.getCommunityId()); } @@ -2653,6 +2667,7 @@ @ApiOperation(value = "实有人口-数据导出") @PostMapping("/data/export") @OperLog(operModul = "居民信息管理-实有人口导出", operType = 0, businessType = "实有人口导出") public R dataExportPopulation(@RequestBody List<Long> Ids) { // 获取登陆用户 LoginUserInfoVO loginUserInfo = this.getLoginUserInfo(); @@ -2865,8 +2880,7 @@ /** * 查询房屋二级级联菜单 * * @param cascadeHouseDTO * 请求参数 * @param cascadeHouseDTO 请求参数 * @return 菜单列表 */ @ApiOperation(value = "房屋级联菜单查询") @@ -2879,8 +2893,7 @@ /** * 查询房屋二级级联菜单后台 * * @param cascadeHouseDTO * 请求参数 * @param cascadeHouseDTO 请求参数 * @return 菜单列表 */ @ApiOperation(value = "房屋级联菜单查询")