+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.epmet.controller;
+
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.dto.IcResiUserAttachmentDTO;
+import com.epmet.excel.ProjectProcessAttachmentExcel;
+import com.epmet.service.IcResiUserAttachmentService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 项目节点附件表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-12-21
+ */
+@RestController
+@RequestMapping("icresiuserattachment")
+public class IcResiUserAttachmentController {
+
+ @Autowired
+ private IcResiUserAttachmentService icResiUserAttachmentService;
+
+ @GetMapping("page")
+ public Result> page(@RequestParam Map params){
+ PageData page = icResiUserAttachmentService.page(params);
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("{id}")
+ public Result get(@PathVariable("id") String id){
+ IcResiUserAttachmentDTO data = icResiUserAttachmentService.get(id);
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ public Result save(@RequestBody IcResiUserAttachmentDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+ icResiUserAttachmentService.save(dto);
+ return new Result();
+ }
+
+ @PutMapping
+ public Result update(@RequestBody IcResiUserAttachmentDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ icResiUserAttachmentService.update(dto);
+ return new Result();
+ }
+
+ @DeleteMapping
+ public Result delete(@RequestBody String[] ids){
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+ icResiUserAttachmentService.delete(ids);
+ return new Result();
+ }
+
+ @GetMapping("export")
+ public void export(@RequestParam Map params, HttpServletResponse response) throws Exception {
+ List list = icResiUserAttachmentService.list(params);
+ ExcelUtils.exportExcelToTarget(response, null, list, ProjectProcessAttachmentExcel.class);
+ }
+
+}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
index e21583fe6d..63372e0bd6 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
@@ -229,16 +229,51 @@ public class IcResiUserController implements ResultDataResolver {
@PostMapping("edit")
public Result edit(@LoginUser TokenDto tokenDto, @RequestBody List formDTO) {
String resiUserId = icResiUserService.edit(tokenDto, formDTO);
+ //推送MQ事件
+ editResiMq(tokenDto.getCustomerId(), resiUserId);
+ return new Result();
+ }
+
+ /**
+ * 租客房东根据身份证更新头像
+ *
+ * @param formDTO
+ * @return com.epmet.commons.tools.utils.Result
+ * @author zhy
+ * @date 2022/4/26 10:48
+ */
+ @PostMapping("rent/rentUpdate")
+ public Result rentUpdate(@RequestBody RentTenantFormDTO formDTO) {
+ String resiUserId = icResiUserService.rentUpdate(formDTO);
+ //推送MQ事件
+ editResiMq(formDTO.getCustomerId(), resiUserId);
+ return new Result();
+ }
+
+ private void editResiMq(String customerId, String userId) {
//推送MQ事件
IcResiUserAddMQMsg mqMsg = new IcResiUserAddMQMsg();
- mqMsg.setCustomerId(tokenDto.getCustomerId());
- log.info("customer id is {}", tokenDto.getCustomerId());
- mqMsg.setIcResiUser(resiUserId);
+ mqMsg.setCustomerId(customerId);
+ log.info("customer id is {}", customerId);
+ mqMsg.setIcResiUser(userId);
SystemMsgFormDTO form = new SystemMsgFormDTO();
form.setMessageType(SystemMessageType.IC_RESI_USER_EDIT);
form.setContent(mqMsg);
epmetMessageOpenFeignClient.sendSystemMsgByMQ(form);
- return new Result();
+ }
+
+ /**
+ * 租客房东黑名单查询个人数据
+ *
+ * @param formDTO
+ * @return com.epmet.commons.tools.utils.Result
+ * @author zhy
+ * @date 2022/4/26 15:51
+ */
+ @PostMapping("rent/tenantData")
+ public Result tenantData(@RequestBody RentTenantDataFormDTO formDTO) {
+ ValidatorUtils.validateEntity(formDTO, RentTenantDataFormDTO.class);
+ return new Result().ok(icResiUserService.tenantData(formDTO));
}
/**
@@ -940,4 +975,19 @@ public class IcResiUserController implements ResultDataResolver {
List r = icResiUserService.listHomeUserBrief(houseId, customerId);
return new Result().ok(r);
}
+// @PostMapping("test-async")
+// public Result testAsync(HttpServletRequest request) {
+//// tl.set("wxz");
+// executorService.submit(() -> {
+// try {
+// Thread.sleep(500l);
+// log.info("[我是子线程]:" + EpmetRequestHolder.getHeader("app"));
+// System.out.println("---");
+// } catch (InterruptedException e) {
+// log.error("method exception", e);
+// }
+// icResiUserImportService.testAsync();
+// });
+// return new Result();
+// }
}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserAttachmentDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserAttachmentDao.java
new file mode 100644
index 0000000000..233a0e756c
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserAttachmentDao.java
@@ -0,0 +1,45 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.result.PublicAndInternalFileResultDTO;
+import com.epmet.entity.IcResiUserAttachmentEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 项目节点附件表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-12-21
+ */
+@Mapper
+public interface IcResiUserAttachmentDao extends BaseDao {
+
+ /**
+ * @Description 根据项目ID查询附件
+ * @Param projectId
+ * @author zxc
+ * @date 2020/12/21 下午4:33
+ */
+ List selectAttachByProjectId(@Param("projectId")String projectId);
+
+}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
index 9392de35a4..6de40fe9fa 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
@@ -164,6 +164,8 @@ public interface IcResiUserDao extends BaseDao {
**/
IcResiUserDTO getResiUser(IcResiUserDTO dto);
+ IcResiUserDTO getResiUserByIdCard(@Param("idCard") String idCard,@Param("customerId") String customerId);
+
/**
* @param agencyId
* @param gridId
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserAttachmentEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserAttachmentEntity.java
new file mode 100644
index 0000000000..a8bc7dd061
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserAttachmentEntity.java
@@ -0,0 +1,119 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.epmet.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.dao.IcResiUserAttachmentDao;
+import com.epmet.dto.IcResiUserAttachmentDTO;
+import com.epmet.entity.IcResiUserAttachmentEntity;
+import com.epmet.service.IcResiUserAttachmentService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 项目节点附件表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-12-21
+ */
+@Service
+public class IcResiUserAttachmentServiceImpl extends BaseServiceImpl implements IcResiUserAttachmentService {
+
+ @Override
+ public PageData page(Map params) {
+ IPage page = baseDao.selectPage(
+ getPage(params, FieldConstant.CREATED_TIME, false),
+ getWrapper(params)
+ );
+ return getPageData(page, IcResiUserAttachmentDTO.class);
+ }
+
+ @Override
+ public List list(Map params) {
+ List entityList = baseDao.selectList(getWrapper(params));
+
+ return ConvertUtils.sourceToTarget(entityList, IcResiUserAttachmentDTO.class);
+ }
+
+ private QueryWrapper getWrapper(Map params){
+ String id = (String)params.get(FieldConstant.ID_HUMP);
+
+ QueryWrapper wrapper = new QueryWrapper<>();
+ wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+ return wrapper;
+ }
+
+ @Override
+ public IcResiUserAttachmentDTO get(String id) {
+ IcResiUserAttachmentEntity entity = baseDao.selectById(id);
+ return ConvertUtils.sourceToTarget(entity, IcResiUserAttachmentDTO.class);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void save(IcResiUserAttachmentDTO dto) {
+ IcResiUserAttachmentEntity entity = ConvertUtils.sourceToTarget(dto, IcResiUserAttachmentEntity.class);
+ insert(entity);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void update(IcResiUserAttachmentDTO dto) {
+ IcResiUserAttachmentEntity entity = ConvertUtils.sourceToTarget(dto, IcResiUserAttachmentEntity.class);
+ updateById(entity);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void delete(String[] ids) {
+ // 逻辑删除（@TableLogic 注解）
+ baseDao.deleteBatchIds(Arrays.asList(ids));
+ }
+
+}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
index 0bcd38c55d..1cffa9c4a0 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
@@ -105,7 +105,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
index 2f7b823bb5..bdbab0392f 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
@@ -365,7 +365,19 @@
AND customer_id = #{customerId}
AND id_card = #{idCard}
-
+