diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java index dffbfdf54..c801775b1 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java @@ -17,6 +17,7 @@ import com.elink.esua.epdc.user.dto.party.FlowPartyDTO; import com.elink.esua.epdc.user.dto.party.KnightPionnerDTO; import com.elink.esua.epdc.user.dto.party.RedSpearheadDTO; import com.elink.esua.epdc.user.dto.party.ReportPartyDTO; +import com.elink.esua.epdc.user.dto.party.form.CentralHouseholdApplyFor; import com.elink.esua.epdc.user.dto.party.form.IntoPartyFormDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -418,6 +419,17 @@ public class ApiAppUserController { return appUserService.saveIntoparty(dto); } + /** + * 党员中心户认证申请 + * @param tokenDto + * @param dto + * @return + */ + @PostMapping("/centralhousehold/save") + public Result saveIntoparty(@LoginUser TokenDto tokenDto, @RequestBody CentralHouseholdApplyFor dto) { + return appUserService.saveCentralHousehold(dto); + } + /** * 在职党员报道 * diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java index 05f35a4aa..c494c4e65 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java @@ -12,6 +12,7 @@ import com.elink.esua.epdc.user.dto.party.FlowPartyDTO; import com.elink.esua.epdc.user.dto.party.KnightPionnerDTO; import com.elink.esua.epdc.user.dto.party.RedSpearheadDTO; import com.elink.esua.epdc.user.dto.party.ReportPartyDTO; +import com.elink.esua.epdc.user.dto.party.form.CentralHouseholdApplyFor; import com.elink.esua.epdc.user.dto.party.form.IntoPartyFormDTO; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; @@ -499,6 +500,10 @@ public interface UserFeignClient { @PostMapping("/app-user/intoparty/save") Result saveIntoparty(IntoPartyFormDTO dto); + + @PostMapping("/app-user/centralhousehold/save") + Result saveCentralHouseholdApplyFor(CentralHouseholdApplyFor applyFor); + /** * 在职党员报到 * diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java index ad12f5c2c..6bd7dfd9d 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java @@ -13,6 +13,7 @@ import com.elink.esua.epdc.user.dto.party.FlowPartyDTO; import com.elink.esua.epdc.user.dto.party.KnightPionnerDTO; import com.elink.esua.epdc.user.dto.party.RedSpearheadDTO; import com.elink.esua.epdc.user.dto.party.ReportPartyDTO; +import com.elink.esua.epdc.user.dto.party.form.CentralHouseholdApplyFor; import com.elink.esua.epdc.user.dto.party.form.IntoPartyFormDTO; import org.springframework.stereotype.Component; @@ -262,6 +263,11 @@ public class UserFeignClientFallback implements UserFeignClient { return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "saveIntoparty", dto); } + @Override + public Result saveCentralHouseholdApplyFor(CentralHouseholdApplyFor applyFor) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "saveCentralHousehold", applyFor); + } + @Override public Result saveReportparty(ReportPartyDTO dto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "saveReportparty", dto); diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java index 5bc5448ab..00a2b0309 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java @@ -15,6 +15,7 @@ import com.elink.esua.epdc.user.dto.party.FlowPartyDTO; import com.elink.esua.epdc.user.dto.party.KnightPionnerDTO; import com.elink.esua.epdc.user.dto.party.RedSpearheadDTO; import com.elink.esua.epdc.user.dto.party.ReportPartyDTO; +import com.elink.esua.epdc.user.dto.party.form.CentralHouseholdApplyFor; import com.elink.esua.epdc.user.dto.party.form.IntoPartyFormDTO; import java.util.List; @@ -395,4 +396,11 @@ public interface AppUserService { Result npmUserUpdate(EpdcUserNpmRegisterFormDTO formDto); Result getByIdCardAndName(ReportPartyDTO dto); + + /** + * 党员中心户认证申请 + * @param dto + * @return + */ + Result saveCentralHousehold(CentralHouseholdApplyFor dto); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java index b9c3414cd..204e9d5d2 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java @@ -44,6 +44,7 @@ import com.elink.esua.epdc.user.dto.party.FlowPartyDTO; import com.elink.esua.epdc.user.dto.party.KnightPionnerDTO; import com.elink.esua.epdc.user.dto.party.RedSpearheadDTO; import com.elink.esua.epdc.user.dto.party.ReportPartyDTO; +import com.elink.esua.epdc.user.dto.party.form.CentralHouseholdApplyFor; import com.elink.esua.epdc.user.dto.party.form.IntoPartyFormDTO; import com.elink.esua.epdc.user.enums.*; import com.elink.esua.epdc.utils.UserTagUtils; @@ -1668,6 +1669,11 @@ public class AppUserServiceImpl implements AppUserService { return userFeignClient.getByIdCardAndName(dto); } + @Override + public Result saveCentralHousehold(CentralHouseholdApplyFor dto) { + return userFeignClient.saveCentralHouseholdApplyFor(dto); + } + @Override public Result saveRedspearhead(RedSpearheadDTO dto) { return userFeignClient.saveRedspearhead(dto); diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/CentralHouseHoldDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/CentralHouseHoldDTO.java new file mode 100755 index 000000000..2dc920f64 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/CentralHouseHoldDTO.java @@ -0,0 +1,102 @@ +/** + * 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.elink.esua.epdc.user.dto.party; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * + * + * @author elink elink@elink-cn.com + * @since v1.0.0 2024-03-12 + */ +@Data +public class CentralHouseHoldDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 用户ID + */ + private String userId; + + /** + * 0、待审核 1、已审核 + */ + private Integer pass; + + /** + * 人员类别 + */ + private String personnelCategory; + + /** + * 居住地址 + */ + private String homeAddr; + + /** + * 意向服务类型 + */ + private String serviceType; + + /** + * 服务范围 + */ + private String serviceScope; + + /** + * 删除标识:0.未删除 1.已删除 + */ + private String delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/form/CentralHouseholdApplyFor.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/form/CentralHouseholdApplyFor.java new file mode 100644 index 000000000..0cf35d4b6 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/form/CentralHouseholdApplyFor.java @@ -0,0 +1,36 @@ +package com.elink.esua.epdc.user.dto.party.form; + +import lombok.Data; + +/** + * @author yan Lu + * @description 描述 + * @create 2024/3/12 15:05 + */ +@Data +public class CentralHouseholdApplyFor { + + /** + * 申请人ID + */ + private String userId; + + /** + * 人员类别 + */ + private String personnelCategory; + + /** + * 居住地址 + */ + private String homeAddr; + + /** + * 意向服务类型 + */ + private String serviceType; + /** + * 服务范围 + */ + private String serviceScope; +} diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/controller/CentralHouseHoldController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/controller/CentralHouseHoldController.java new file mode 100755 index 000000000..fad5cf0c3 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/controller/CentralHouseHoldController.java @@ -0,0 +1,94 @@ +/** + * 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.elink.esua.epdc.party.controller; + +import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.commons.tools.validator.AssertUtils; +import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; +import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; +import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; +import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; +import com.elink.esua.epdc.party.excel.CentralHouseHoldExcel; +import com.elink.esua.epdc.party.service.CentralHouseHoldService; +import com.elink.esua.epdc.user.dto.party.CentralHouseHoldDTO; +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 elink elink@elink-cn.com + * @since v1.0.0 2024-03-12 + */ +@RestController +@RequestMapping("centralhousehold") +public class CentralHouseHoldController { + + @Autowired + private CentralHouseHoldService centralHouseHoldService; + + @GetMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = centralHouseHoldService.page(params); + return new Result>().ok(page); + } + + @GetMapping("{id}") + public Result get(@PathVariable("id") String id){ + CentralHouseHoldDTO data = centralHouseHoldService.get(id); + return new Result().ok(data); + } + + @PostMapping("save") + public Result save(@RequestBody CentralHouseHoldDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + centralHouseHoldService.save(dto); + return new Result(); + } + + @PutMapping + public Result update(@RequestBody CentralHouseHoldDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + centralHouseHoldService.update(dto); + return new Result(); + } + + @DeleteMapping + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + centralHouseHoldService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = centralHouseHoldService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, CentralHouseHoldExcel.class); + } + +} diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/dao/CentralHouseholdDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/dao/CentralHouseholdDao.java new file mode 100755 index 000000000..40f99f4ec --- /dev/null +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/dao/CentralHouseholdDao.java @@ -0,0 +1,33 @@ +/** + * 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.elink.esua.epdc.party.dao; + +import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.party.entity.CentralHouseHoldEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * + * + * @author elink elink@elink-cn.com + * @since v1.0.0 2024-03-12 + */ +@Mapper +public interface CentralHouseHoldDao extends BaseDao { + +} diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/entity/CentralHouseholdEntity.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/entity/CentralHouseholdEntity.java new file mode 100755 index 000000000..5019979d0 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/entity/CentralHouseholdEntity.java @@ -0,0 +1,68 @@ +/** + * 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.elink.esua.epdc.party.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * + * + * @author elink elink@elink-cn.com + * @since v1.0.0 2024-03-12 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("central_house_hold") +public class CentralHouseHoldEntity extends BaseEpdcEntity { + + private static final long serialVersionUID = 1L; + + /** + * 用户ID + */ + private String userId; + + /** + * 0、待审核 1、已审核 + */ + private Integer pass; + + /** + * 人员类别 + */ + private String personnelCategory; + + /** + * 居住地址 + */ + private String homeAddr; + + /** + * 意向服务类型 + */ + private String serviceType; + + /** + * 服务范围 + */ + private String serviceScope; + +} diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/excel/CentralHouseHoldExcel.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/excel/CentralHouseHoldExcel.java new file mode 100755 index 000000000..fbbec209b --- /dev/null +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/excel/CentralHouseHoldExcel.java @@ -0,0 +1,74 @@ +/** + * 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.elink.esua.epdc.party.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** + * + * + * @author elink elink@elink-cn.com + * @since v1.0.0 2024-03-12 + */ +@Data +public class CentralHouseHoldExcel { + + @Excel(name = "主键") + private String id; + + @Excel(name = "用户ID") + private String userId; + + @Excel(name = "0、待审核 1、已审核") + private Integer pass; + + @Excel(name = "人员类别") + private String personnelCategory; + + @Excel(name = "居住地址") + private String homeAddr; + + @Excel(name = "意向服务类型") + private String serviceType; + + @Excel(name = "服务范围") + private String serviceScope; + + @Excel(name = "删除标识:0.未删除 1.已删除") + private String delFlag; + + @Excel(name = "乐观锁") + private Integer revision; + + @Excel(name = "创建人") + private String createdBy; + + @Excel(name = "创建时间") + private Date createdTime; + + @Excel(name = "更新人") + private String updatedBy; + + @Excel(name = "更新时间") + private Date updatedTime; + + +} diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/CentralHouseholdService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/CentralHouseholdService.java new file mode 100755 index 000000000..01af6a29d --- /dev/null +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/CentralHouseholdService.java @@ -0,0 +1,95 @@ +/** + * 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.elink.esua.epdc.party.service; + +import com.elink.esua.epdc.commons.mybatis.service.BaseService; +import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.party.entity.CentralHouseHoldEntity; +import com.elink.esua.epdc.user.dto.party.CentralHouseHoldDTO; + +import java.util.List; +import java.util.Map; + +/** + * + * + * @author elink elink@elink-cn.com + * @since v1.0.0 2024-03-12 + */ +public interface CentralHouseHoldService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2024-03-12 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2024-03-12 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return CentralHouseHoldDTO + * @author generator + * @date 2024-03-12 + */ + CentralHouseHoldDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2024-03-12 + */ + void save(CentralHouseHoldDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2024-03-12 + */ + void update(CentralHouseHoldDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2024-03-12 + */ + void delete(String[] ids); +} diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/CentralHouseholdServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/CentralHouseholdServiceImpl.java new file mode 100755 index 000000000..bb41d8e22 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/CentralHouseholdServiceImpl.java @@ -0,0 +1,99 @@ +/** + * 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.elink.esua.epdc.party.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; +import com.elink.esua.epdc.commons.tools.constant.FieldConstant; +import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; +import com.elink.esua.epdc.party.dao.CentralHouseHoldDao; +import com.elink.esua.epdc.party.entity.CentralHouseHoldEntity; +import com.elink.esua.epdc.party.service.CentralHouseHoldService; +import com.elink.esua.epdc.user.dto.party.CentralHouseHoldDTO; +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 elink elink@elink-cn.com + * @since v1.0.0 2024-03-12 + */ +@Service +public class CentralHouseHoldServiceImpl extends BaseServiceImpl implements CentralHouseHoldService { + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, CentralHouseHoldDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, CentralHouseHoldDTO.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 CentralHouseHoldDTO get(String id) { + CentralHouseHoldEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, CentralHouseHoldDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(CentralHouseHoldDTO dto) { + CentralHouseHoldEntity entity = ConvertUtils.sourceToTarget(dto, CentralHouseHoldEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(CentralHouseHoldDTO dto) { + CentralHouseHoldEntity entity = ConvertUtils.sourceToTarget(dto, CentralHouseHoldEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除(@TableLogic 注解) + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + +} diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/CentralHouseHoldDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/CentralHouseHoldDao.xml new file mode 100755 index 000000000..37f28a18b --- /dev/null +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/CentralHouseHoldDao.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/renren-cloud-generator/src/main/resources/application.yml b/renren-cloud-generator/src/main/resources/application.yml index ee5e4935f..7d9d8ffbd 100644 --- a/renren-cloud-generator/src/main/resources/application.yml +++ b/renren-cloud-generator/src/main/resources/application.yml @@ -9,9 +9,9 @@ spring: type: com.alibaba.druid.pool.DruidDataSource #MySQL配置 driverClassName: com.mysql.jdbc.Driver - url: jdbc:mysql://47.104.92.53:3306/one?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai - username: root - password: Elink@888 + url: jdbc:mysql://192.168.1.144:3306/epmet_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai + username: epmet + password: EpmEt_UsEr@sAAs #oracle配置 # driverClassName: oracle.jdbc.OracleDriver # url: jdbc:oracle:thin:@192.168.10.10:1521:helowin @@ -46,4 +46,4 @@ pagehelper: #指定数据库,可选值有【mysql、oracle、sqlserver、postgresql】 renren: - database: mysql \ No newline at end of file + database: mysql