Browse Source

移动端发布议题接口 init

dev
liuchuang 6 years ago
parent
commit
81c8d91b1e
  1. 5
      esua-epdc/epdc-commons/epdc-common-clienttoken/src/main/java/com/elink/esua/epdc/common/token/dto/TokenDto.java
  2. 17
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiIssueController.java
  3. 21
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/IssueFeignClient.java
  4. 28
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/SysDeptFeignClient.java
  5. 6
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/IssueFeignClientFallback.java
  6. 22
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/SysDeptFeignClientFallback.java
  7. 10
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/IssueService.java
  8. 28
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java
  9. 19
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/ImageConstant.java
  10. 98
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventSubmitFormDTO.java
  11. 2
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueDTO.java
  12. 41
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcAppEventsController.java
  13. 33
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/ImgDao.java
  14. 2
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/EpdcEventsEntity.java
  15. 55
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/ImgEntity.java
  16. 10
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java
  17. 51
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/ImgService.java
  18. 18
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java
  19. 65
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/ImgServiceImpl.java

5
esua-epdc/epdc-commons/epdc-common-clienttoken/src/main/java/com/elink/esua/epdc/common/token/dto/TokenDto.java

@ -45,4 +45,9 @@ public class TokenDto implements Serializable {
* 网格ID
*/
private String gridId;
/**
* 党员标识 01
*/
private Long partyFlag;
}

17
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiIssueController.java

@ -3,13 +3,12 @@ package com.elink.esua.epdc.controller;
import com.elink.esua.epdc.common.token.dto.TokenDto;
import com.elink.esua.epdc.commons.tools.annotation.LoginUser;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.events.form.EpdcEventSubmitFormDTO;
import com.elink.esua.epdc.dto.issue.form.IssueFormDTO;
import com.elink.esua.epdc.dto.issue.result.IssueResultDTO;
import com.elink.esua.epdc.service.IssueService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@ -25,6 +24,18 @@ public class ApiIssueController {
@Autowired
private IssueService issueService;
/**
* 发布事件
* @Params: [userDetail, formDto]
* @Return: com.elink.esua.epdc.commons.tools.utils.Result
* @Author: liuchuang
* @Date: 2019/9/8 15:36
*/
@PostMapping("submit")
public Result submitEvent(@LoginUser TokenDto userDetail, EpdcEventSubmitFormDTO formDto) {
return issueService.saveEvent(userDetail, formDto);
}
/**
* 议题最新最热列表
* @Params: [userDetail, formDto]

21
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/IssueFeignClient.java

@ -2,12 +2,14 @@ package com.elink.esua.epdc.feign;
import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.events.form.EpdcEventSubmitFormDTO;
import com.elink.esua.epdc.dto.issue.form.IssueFormDTO;
import com.elink.esua.epdc.dto.issue.result.IssueResultDTO;
import com.elink.esua.epdc.feign.fallback.IssueFeignClientFallback;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import java.util.List;
@ -16,9 +18,26 @@ import java.util.List;
* @Author LC
* @Date 2019/9/7 11:34
*/
@FeignClient(name = ServiceConstant.EPDC_EVENTS_SERVER, fallback = IssueFeignClientFallback.class, url = "http://localhost:9066")
@FeignClient(name = ServiceConstant.EPDC_EVENTS_SERVER, fallback = IssueFeignClientFallback.class)
public interface IssueFeignClient {
/**
* 发布事件
* @Params: [formDto]
* @Return: com.elink.esua.epdc.commons.tools.utils.Result
* @Author: liuchuang
* @Date: 2019/9/8 16:39
*/
@PostMapping(value = "events/epdc-app/event/submit", consumes = MediaType.APPLICATION_JSON_VALUE)
Result submitEvent(EpdcEventSubmitFormDTO formDto);
/**
* 议题最新最热列表
* @Params: [formDto]
* @Return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.issue.result.IssueResultDTO>>
* @Author: liuchuang
* @Date: 2019/9/8 16:39
*/
@GetMapping(value = "events/epdc-app/issue/list", consumes = MediaType.APPLICATION_JSON_VALUE)
Result<List<IssueResultDTO>> listIssues(IssueFormDTO formDto);
}

28
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/SysDeptFeignClient.java

@ -0,0 +1,28 @@
package com.elink.esua.epdc.feign;
import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.CompleteDeptDTO;
import com.elink.esua.epdc.feign.fallback.SysDeptFeignClientFallback;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
/**
* 系统服务模块
* @Author LC
* @Date 2019/9/8 16:00
*/
@FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = SysDeptFeignClientFallback.class)
public interface SysDeptFeignClient {
/**
* 通过网格ID获取该网格所有上级机构
* @Params: [gridId]
* @Return: com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.CompleteDeptDTO>
* @Author: liuchuang
* @Date: 2019/9/8 16:11
*/
@GetMapping(value = "sys/dept/getCompleteDept/{gridId}")
Result<CompleteDeptDTO> getCompleteDept(@PathVariable("gridId") Long gridId);
}

6
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/IssueFeignClientFallback.java

@ -3,6 +3,7 @@ package com.elink.esua.epdc.feign.fallback;
import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.events.form.EpdcEventSubmitFormDTO;
import com.elink.esua.epdc.dto.issue.form.IssueFormDTO;
import com.elink.esua.epdc.dto.issue.result.IssueResultDTO;
import com.elink.esua.epdc.feign.IssueFeignClient;
@ -17,6 +18,11 @@ import java.util.List;
@Component
public class IssueFeignClientFallback implements IssueFeignClient {
@Override
public Result submitEvent(EpdcEventSubmitFormDTO formDto) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "submitEvent", formDto);
}
@Override
public Result<List<IssueResultDTO>> listIssues(IssueFormDTO formDto) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "listIssues", formDto);

22
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/SysDeptFeignClientFallback.java

@ -0,0 +1,22 @@
package com.elink.esua.epdc.feign.fallback;
import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.CompleteDeptDTO;
import com.elink.esua.epdc.feign.SysDeptFeignClient;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.PathVariable;
/**
* @Author LC
* @Date 2019/9/8 16:00
*/
@Component
public class SysDeptFeignClientFallback implements SysDeptFeignClient {
@Override
public Result<CompleteDeptDTO> getCompleteDept(@PathVariable("gridId") Long gridId) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getCompleteDept", gridId);
}
}

10
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/IssueService.java

@ -2,6 +2,7 @@ package com.elink.esua.epdc.service;
import com.elink.esua.epdc.common.token.dto.TokenDto;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.events.form.EpdcEventSubmitFormDTO;
import com.elink.esua.epdc.dto.issue.form.IssueFormDTO;
import com.elink.esua.epdc.dto.issue.result.IssueResultDTO;
@ -14,6 +15,15 @@ import java.util.List;
*/
public interface IssueService {
/**
* 发布事件
* @Params: [userDetail, formDto]
* @Return: com.elink.esua.epdc.commons.tools.utils.Result
* @Author: liuchuang
* @Date: 2019/9/8 15:37
*/
Result saveEvent(TokenDto userDetail, EpdcEventSubmitFormDTO formDto);
/**
* 移动端-最新最热列表
* @Params: [userDetail, formDto]

28
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java

@ -2,9 +2,12 @@ package com.elink.esua.epdc.service.impl;
import com.elink.esua.epdc.common.token.dto.TokenDto;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.CompleteDeptDTO;
import com.elink.esua.epdc.dto.events.form.EpdcEventSubmitFormDTO;
import com.elink.esua.epdc.dto.issue.form.IssueFormDTO;
import com.elink.esua.epdc.dto.issue.result.IssueResultDTO;
import com.elink.esua.epdc.feign.IssueFeignClient;
import com.elink.esua.epdc.feign.SysDeptFeignClient;
import com.elink.esua.epdc.service.IssueService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -22,6 +25,31 @@ public class IssueServiceImpl implements IssueService {
@Autowired
private IssueFeignClient issueFeignClient;
@Autowired
private SysDeptFeignClient sysDeptFeignClient;
@Override
public Result saveEvent(TokenDto userDetail, EpdcEventSubmitFormDTO formDto) {
// 获取该网格所有上级机构
Result<CompleteDeptDTO> deptDTOResult = sysDeptFeignClient.getCompleteDept(Long.valueOf(userDetail.getGridId()));
CompleteDeptDTO deptDTO = deptDTOResult.getData();
formDto.setArea(deptDTO.getDistrict());
formDto.setAreaId(deptDTO.getDistrictId().toString());
formDto.setStreet(deptDTO.getStreet());
formDto.setStreetId(deptDTO.getStreetId().toString());
formDto.setCommunity(deptDTO.getCommunity());
formDto.setCommunityId(deptDTO.getCommunityId().toString());
formDto.setGrid(deptDTO.getGrid());
formDto.setGridId(deptDTO.getGridId().toString());
// 用户信息
formDto.setUserId(userDetail.getUserId());
formDto.setNickName(userDetail.getNickName());
formDto.setUserFace(userDetail.getFaceImg());
formDto.setIsPartyMember(userDetail.getPartyFlag());
return issueFeignClient.submitEvent(formDto);
}
@Override
public Result<List<IssueResultDTO>> listIssues(TokenDto userDetail, IssueFormDTO formDto) {
formDto.setDeptId(userDetail.getGridId());

19
esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/ImageConstant.java

@ -0,0 +1,19 @@
package com.elink.esua.epdc.constant;
/**
* 图片常量
* @Author LC
* @Date 2019/9/8 17:07
*/
public interface ImageConstant {
/**
* 图片类型-事件
*/
public final static String TYPE_IMAGE_BIZ_EVENTS = "events";
/**
* 图片类型-头像
*/
public final static String TYPE_IMAGE_BIZ_FACE = "face";
}

98
esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventSubmitFormDTO.java

@ -0,0 +1,98 @@
package com.elink.esua.epdc.dto.events.form;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.util.List;
/**
* @Author LC
* @Date 2019/9/8 15:25
*/
@Data
public class EpdcEventSubmitFormDTO implements Serializable {
private static final long serialVersionUID = -1869446375416414676L;
/**
* 事件内容
*/
@NotBlank(message = "事件内容不能为空")
private String eventContent;
/**
* 事件地址
*/
@NotBlank(message = "地址信息不能为空")
private String issueAddress;
/**
* 经度
*/
@NotNull(message = "经度不能为空")
private Double issueLongitude;
/**
* 纬度
*/
@NotNull(message = "纬度不能为空")
private Double issueLatitude;
/**
* 图片
*/
private List<String> images;
/**
*
*/
private String area;
/**
* 区ID
*/
@NotBlank(message = "用户区ID不能为空")
private String areaId;
/**
* 街道
*/
private String street;
/**
* 街道ID
*/
@NotBlank(message = "用户街道ID不能为空")
private String streetId;
/**
* 社区
*/
private String community;
/**
* 社区ID
*/
@NotBlank(message = "用户社区ID不能为空")
private String communityId;
/**
* 网格
*/
private String grid;
/**
* 网格ID
*/
@NotBlank(message = "用户网格ID不能为空")
private String gridId;
/**
* 用户ID
*/
@NotBlank(message = "用户ID不能为空")
private String userId;
/**
* 昵称
*/
private String nickName;
/**
* 用户头像
*/
private String userFace;
/**
* 党员标识 01
*/
private Long isPartyMember;
}

2
esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueDTO.java

@ -117,7 +117,7 @@ public class IssueDTO implements Serializable {
/**
* 议题位置纬度
*/
private BigDecimal issusLatitude;
private BigDecimal issueLatitude;
/**
* 议题位置经度

41
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcAppEventsController.java

@ -0,0 +1,41 @@
package com.elink.esua.epdc.modules.events.controller;
import com.elink.esua.epdc.commons.tools.constant.Constant;
import com.elink.esua.epdc.commons.tools.utils.Result;
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.dto.events.form.EpdcEventSubmitFormDTO;
import com.elink.esua.epdc.modules.events.service.EpdcEventsService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* @Author LC
* @Date 2019/9/8 16:42
*/
@RestController
@RequestMapping(Constant.EPDC_APP + "event")
public class EpdcAppEventsController {
@Autowired
private EpdcEventsService epdcEventsService;
/**
* 发布议题
* @Params: [formDto]
* @Return: com.elink.esua.epdc.commons.tools.utils.Result
* @Author: liuchuang
* @Date: 2019/9/8 16:54
*/
@PostMapping("submit")
public Result submitEvent(@RequestBody EpdcEventSubmitFormDTO formDto) {
//效验数据
ValidatorUtils.validateEntity(formDto, AddGroup.class, DefaultGroup.class);
epdcEventsService.saveEvent(formDto);
return new Result();
}
}

33
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/ImgDao.java

@ -0,0 +1,33 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* 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.
* <p>
* 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.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.elink.esua.epdc.modules.events.dao;
import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
import com.elink.esua.epdc.modules.events.entity.ImgEntity;
import org.apache.ibatis.annotations.Mapper;
/**
* 党建系统图片表 党建系统图片表
*
* @author qu qu@elink-cn.com
* @since v1.0.0 2019-09-08
*/
@Mapper
public interface ImgDao extends BaseDao<ImgEntity> {
}

2
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/EpdcEventsEntity.java

@ -105,7 +105,7 @@ public class EpdcEventsEntity extends BaseEpdcEntity {
/**
* 议题位置纬度
*/
private BigDecimal issusLatitude;
private BigDecimal issueLatitude;
/**
* 议题位置经度
*/

55
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/ImgEntity.java

@ -0,0 +1,55 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* 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.
* <p>
* 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.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.elink.esua.epdc.modules.events.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* 党建系统图片表 党建系统图片表
*
* @author qu qu@elink-cn.com
* @since v1.0.0 2019-09-08
*/
@Data
@EqualsAndHashCode(callSuper=false)
@TableName("epdc_img")
public class ImgEntity extends BaseEpdcEntity {
private static final long serialVersionUID = 1L;
/**
* 引用ID
*/
private String referenceId;
/**
* 图片地址
*/
private String imgUrl;
/**
* 图片类型
*/
private String imgType;
}

10
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java

@ -21,6 +21,7 @@ import com.elink.esua.epdc.commons.mybatis.service.BaseService;
import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.events.*;
import com.elink.esua.epdc.dto.events.form.EpdcEventSubmitFormDTO;
import com.elink.esua.epdc.dto.events.form.EpdcEventsReviewFormDTO;
import com.elink.esua.epdc.modules.events.entity.EpdcEventsEntity;
@ -57,6 +58,15 @@ public interface EpdcEventsService extends BaseService<EpdcEventsEntity> {
void save(EpdcEventsDTO dto);
/**
* 发布议题
* @Params: [dto]
* @Return: void
* @Author: liuchuang
* @Date: 2019/9/8 16:52
*/
void saveEvent(EpdcEventSubmitFormDTO dto);
void update(EpdcEventsDTO dto);
void delete(String[] ids);

51
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/ImgService.java

@ -0,0 +1,51 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* 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.
* <p>
* 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.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.elink.esua.epdc.modules.events.service;
import com.elink.esua.epdc.commons.mybatis.service.BaseService;
import com.elink.esua.epdc.modules.events.entity.ImgEntity;
import java.util.List;
/**
* 党建系统图片表 党建系统图片表
*
* @author qu qu@elink-cn.com
* @since v1.0.0 2019-09-08
*/
public interface ImgService extends BaseService<ImgEntity> {
/**
* 批量删除
*
* @param ids
* @return void
* @author
* @date
*/
void delete(String[] ids);
/**
* 保存图片
* @Params: [images, eventId, imgType]
* @Return: boolean
* @Author: liuchuang
* @Date: 2019/9/8 17:12
*/
boolean saveImages(List<String> images, String referenceId, String imgType);
}

18
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java

@ -26,11 +26,14 @@ import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.constant.EventIssueItemState;
import com.elink.esua.epdc.constant.ImageConstant;
import com.elink.esua.epdc.dto.events.*;
import com.elink.esua.epdc.dto.events.form.EpdcEventSubmitFormDTO;
import com.elink.esua.epdc.dto.events.form.EpdcEventsReviewFormDTO;
import com.elink.esua.epdc.modules.events.dao.EpdcEventsDao;
import com.elink.esua.epdc.modules.events.entity.EpdcEventsEntity;
import com.elink.esua.epdc.modules.events.service.EpdcEventsService;
import com.elink.esua.epdc.modules.events.service.ImgService;
import com.elink.esua.epdc.modules.issue.entity.IssueEntity;
import com.elink.esua.epdc.modules.issue.entity.IssueHandleEntity;
import com.elink.esua.epdc.modules.issue.service.IssueHandleService;
@ -59,6 +62,9 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
@Autowired
private IssueHandleService issueHandleService;
@Autowired
private ImgService imgService;
@Override
public PageData<EpdcEventsDTO> listOfPendingReviewEvents(Map<String, Object> params) {
IPage<EpdcEventsDTO> page = getPage(params);
@ -95,6 +101,16 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
insert(entity);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void saveEvent(EpdcEventSubmitFormDTO dto) {
EpdcEventsEntity entity = ConvertUtils.sourceToTarget(dto, EpdcEventsEntity.class);
insert(entity);
// 保存图片
imgService.saveImages(dto.getImages(), entity.getId(), ImageConstant.TYPE_IMAGE_BIZ_EVENTS);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void update(EpdcEventsDTO dto) {
@ -193,7 +209,7 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
issueEntity.setGridId(entity.getGridId());
issueEntity.setIssueAddress(entity.getIssueAddress());
issueEntity.setIssueCategoryId(entity.getIssueCategoryId());
issueEntity.setIssusLatitude(entity.getIssusLatitude());
issueEntity.setIssusLatitude(entity.getIssueLatitude());
issueEntity.setIssueLongitude(entity.getIssueLongitude());
issueEntity.setFriendlyCommunityId(entity.getFriendlyCommunityId());
issueEntity.setIssueState(EventIssueItemState.ISSUE_REVIEW_PASS);

65
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/ImgServiceImpl.java

@ -0,0 +1,65 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* 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.
* <p>
* 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.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.elink.esua.epdc.modules.events.service.impl;
import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
import com.elink.esua.epdc.modules.events.dao.ImgDao;
import com.elink.esua.epdc.modules.events.entity.ImgEntity;
import com.elink.esua.epdc.modules.events.service.ImgService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/**
* 党建系统图片表 党建系统图片表
*
* @author qu qu@elink-cn.com
* @since v1.0.0 2019-09-08
*/
@Service
public class ImgServiceImpl extends BaseServiceImpl<ImgDao, ImgEntity> implements ImgService {
@Override
@Transactional(rollbackFor = Exception.class)
public void delete(String[] ids) {
// 逻辑删除(@TableLogic 注解)
baseDao.deleteBatchIds(Arrays.asList(ids));
}
@Override
@Transactional(rollbackFor = Exception.class)
public boolean saveImages(List<String> images, String referenceId, String imgType) {
if (null == images || images.isEmpty()) {
return true;
}
List<ImgEntity> imgEntities = new ArrayList<>(images.size());
ImgEntity entity = null;
for (int i = 0; i < images.size(); i++) {
entity = new ImgEntity();
entity.setReferenceId(referenceId);
entity.setImgUrl(images.get(i));
entity.setImgType(imgType);
imgEntities.add(entity);
}
return insertBatch(imgEntities);
}
}
Loading…
Cancel
Save