Browse Source

add /data/report/screen/agency/addstreetcomm api v3

dev_shibei_match
yinzuomei 5 years ago
parent
commit
3d95f062e0
  1. 18
      epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/commonservice/AddAreaCodeDictResultDTO.java
  2. 2
      epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/AgencyController.java
  3. 2
      epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/AgencyService.java
  4. 12
      epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java
  5. 18
      epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/result/AddAreaCodeDictResultDTO.java
  6. 7
      epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/EpmetCommonServiceOpenFeignClient.java
  7. 2
      epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/fallback/EpmetCommonServiceOpenFeignClientFallback.java
  8. 5
      epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/AreaCodeController.java
  9. 3
      epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/AreaCodeService.java
  10. 9
      epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java

18
epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/commonservice/AddAreaCodeDictResultDTO.java

@ -0,0 +1,18 @@
package com.epmet.dto.result.commonservice;
import lombok.Data;
import java.io.Serializable;
/**
* 003新增街道或者社区地区编码 入参
*
* @author yinzuomei@elink-cn.com
* @date 2021/2/5 17:39
*/
@Data
public class AddAreaCodeDictResultDTO implements Serializable {
private static final long serialVersionUID = 7505566589581480619L;
private String code;
}

2
epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/AgencyController.java

@ -5,8 +5,8 @@ import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.datareport.service.evaluationindex.screen.AgencyService; import com.epmet.datareport.service.evaluationindex.screen.AgencyService;
import com.epmet.dto.form.AddAreaCodeDictFormDTO; import com.epmet.dto.form.AddAreaCodeDictFormDTO;
import com.epmet.dto.form.AreaCodeDictFormDTO; import com.epmet.dto.form.AreaCodeDictFormDTO;
import com.epmet.dto.result.AddAreaCodeDictResultDTO;
import com.epmet.dto.result.AreaCodeDictResultDTO; import com.epmet.dto.result.AreaCodeDictResultDTO;
import com.epmet.dto.result.commonservice.AddAreaCodeDictResultDTO;
import com.epmet.evaluationindex.screen.dto.form.CompartmentByBizTypeFormDTO; import com.epmet.evaluationindex.screen.dto.form.CompartmentByBizTypeFormDTO;
import com.epmet.evaluationindex.screen.dto.form.CompartmentFormDTO; import com.epmet.evaluationindex.screen.dto.form.CompartmentFormDTO;
import com.epmet.evaluationindex.screen.dto.form.TreeByTypeFormDTO; import com.epmet.evaluationindex.screen.dto.form.TreeByTypeFormDTO;

2
epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/AgencyService.java

@ -2,8 +2,8 @@ package com.epmet.datareport.service.evaluationindex.screen;
import com.epmet.dto.form.AddAreaCodeDictFormDTO; import com.epmet.dto.form.AddAreaCodeDictFormDTO;
import com.epmet.dto.form.AreaCodeDictFormDTO; import com.epmet.dto.form.AreaCodeDictFormDTO;
import com.epmet.dto.result.AddAreaCodeDictResultDTO;
import com.epmet.dto.result.AreaCodeDictResultDTO; import com.epmet.dto.result.AreaCodeDictResultDTO;
import com.epmet.dto.result.commonservice.AddAreaCodeDictResultDTO;
import com.epmet.evaluationindex.screen.dto.form.CompartmentByBizTypeFormDTO; import com.epmet.evaluationindex.screen.dto.form.CompartmentByBizTypeFormDTO;
import com.epmet.evaluationindex.screen.dto.form.CompartmentFormDTO; import com.epmet.evaluationindex.screen.dto.form.CompartmentFormDTO;
import com.epmet.evaluationindex.screen.dto.form.TreeByTypeFormDTO; import com.epmet.evaluationindex.screen.dto.form.TreeByTypeFormDTO;

12
epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java

@ -10,8 +10,8 @@ import com.epmet.datareport.dao.evaluationindex.screen.ScreenCustomerGridDao;
import com.epmet.datareport.service.evaluationindex.screen.AgencyService; import com.epmet.datareport.service.evaluationindex.screen.AgencyService;
import com.epmet.dto.form.AddAreaCodeDictFormDTO; import com.epmet.dto.form.AddAreaCodeDictFormDTO;
import com.epmet.dto.form.AreaCodeDictFormDTO; import com.epmet.dto.form.AreaCodeDictFormDTO;
import com.epmet.dto.result.AddAreaCodeDictResultDTO;
import com.epmet.dto.result.AreaCodeDictResultDTO; import com.epmet.dto.result.AreaCodeDictResultDTO;
import com.epmet.dto.result.commonservice.AddAreaCodeDictResultDTO;
import com.epmet.evaluationindex.screen.constant.ScreenConstant; import com.epmet.evaluationindex.screen.constant.ScreenConstant;
import com.epmet.evaluationindex.screen.dto.form.CompartmentByBizTypeFormDTO; import com.epmet.evaluationindex.screen.dto.form.CompartmentByBizTypeFormDTO;
import com.epmet.evaluationindex.screen.dto.form.CompartmentFormDTO; import com.epmet.evaluationindex.screen.dto.form.CompartmentFormDTO;
@ -253,10 +253,12 @@ public class AgencyServiceImpl implements AgencyService {
@Override @Override
public AddAreaCodeDictResultDTO addStreetCommAreaCode(AddAreaCodeDictFormDTO formDTO) { public AddAreaCodeDictResultDTO addStreetCommAreaCode(AddAreaCodeDictFormDTO formDTO) {
Result<AddAreaCodeDictResultDTO> res=commonServiceOpenFeignClient.addStreetCommAreaCode(formDTO); Result<String> res = commonServiceOpenFeignClient.addStreetCommAreaCode(formDTO);
if(res.success()&&null!=res.getData()){ if (res.success() && null != res.getData()) {
return new AddAreaCodeDictResultDTO(res.getData().getCode()); AddAreaCodeDictResultDTO resultDTO = new AddAreaCodeDictResultDTO();
resultDTO.setCode(res.getData());
return resultDTO;
} }
throw new RenException(res.getMsg()+res.getInternalMsg()); throw new RenException(res.getMsg() + res.getInternalMsg());
} }
} }

18
epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/dto/result/AddAreaCodeDictResultDTO.java

@ -1,18 +0,0 @@
package com.epmet.dto.result;
import lombok.Data;
/**
* 003新增街道或者社区地区编码 入参
*
* @author yinzuomei@elink-cn.com
* @date 2021/2/5 17:39
*/
@Data
public class AddAreaCodeDictResultDTO {
private String code;
public AddAreaCodeDictResultDTO(String code) {
this.code = code;
}
}

7
epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/EpmetCommonServiceOpenFeignClient.java

@ -6,6 +6,7 @@ import com.epmet.dto.form.*;
import com.epmet.dto.result.*; import com.epmet.dto.result.*;
import com.epmet.feign.fallback.EpmetCommonServiceOpenFeignClientFallback; import com.epmet.feign.fallback.EpmetCommonServiceOpenFeignClientFallback;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
@ -19,7 +20,7 @@ import java.util.Map;
* @date 2020/6/4 10:28 * @date 2020/6/4 10:28
*/ */
@FeignClient(name = ServiceConstant.EPMET_COMMON_SERVICE, fallback = EpmetCommonServiceOpenFeignClientFallback.class) @FeignClient(name = ServiceConstant.EPMET_COMMON_SERVICE, fallback = EpmetCommonServiceOpenFeignClientFallback.class)
//@FeignClient(name = ServiceConstant.EPMET_COMMON_SERVICE, fallback = EpmetCommonServiceOpenFeignClientFallback.class, url = "http://localhost:8103") // @FeignClient(name = ServiceConstant.EPMET_COMMON_SERVICE, fallback = EpmetCommonServiceOpenFeignClientFallback.class, url = "http://localhost:8103")
public interface EpmetCommonServiceOpenFeignClient { public interface EpmetCommonServiceOpenFeignClient {
/** /**
* @param formDTO * @param formDTO
@ -110,6 +111,6 @@ public interface EpmetCommonServiceOpenFeignClient {
* @description 003新增街道或者社区地区编码 * @description 003新增街道或者社区地区编码
* @Date 2021/2/5 17:39 * @Date 2021/2/5 17:39
**/ **/
@PostMapping("commonservice/areacode/addstreetcommareacode") @PostMapping(value = "commonservice/areacode/addstreetcommareacode", consumes = MediaType.APPLICATION_JSON_VALUE)
Result<AddAreaCodeDictResultDTO> addStreetCommAreaCode(@RequestBody AddAreaCodeDictFormDTO formDTO); Result<String> addStreetCommAreaCode(@RequestBody AddAreaCodeDictFormDTO formDTO);
} }

2
epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/fallback/EpmetCommonServiceOpenFeignClientFallback.java

@ -86,7 +86,7 @@ public class EpmetCommonServiceOpenFeignClientFallback implements EpmetCommonSer
} }
@Override @Override
public Result<AddAreaCodeDictResultDTO> addStreetCommAreaCode(AddAreaCodeDictFormDTO formDTO) { public Result<String> addStreetCommAreaCode(AddAreaCodeDictFormDTO formDTO) {
return ModuleUtils.feignConError(ServiceConstant.EPMET_COMMON_SERVICE, "addStreetCommAreaCode", formDTO); return ModuleUtils.feignConError(ServiceConstant.EPMET_COMMON_SERVICE, "addStreetCommAreaCode", formDTO);
} }
} }

5
epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/AreaCodeController.java

@ -27,7 +27,6 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.dto.AreaCodeDTO; import com.epmet.dto.AreaCodeDTO;
import com.epmet.dto.form.AddAreaCodeDictFormDTO; import com.epmet.dto.form.AddAreaCodeDictFormDTO;
import com.epmet.dto.form.AreaCodeDictFormDTO; import com.epmet.dto.form.AreaCodeDictFormDTO;
import com.epmet.dto.result.AddAreaCodeDictResultDTO;
import com.epmet.dto.result.AreaCodeDictResultDTO; import com.epmet.dto.result.AreaCodeDictResultDTO;
import com.epmet.service.AreaCodeService; import com.epmet.service.AreaCodeService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -104,8 +103,8 @@ public class AreaCodeController {
* @Date 2021/2/5 17:39 * @Date 2021/2/5 17:39
**/ **/
@PostMapping("addstreetcommareacode") @PostMapping("addstreetcommareacode")
Result<AddAreaCodeDictResultDTO> addStreetCommAreaCode(@RequestBody AddAreaCodeDictFormDTO formDTO) { Result<String> addStreetCommAreaCode(@RequestBody AddAreaCodeDictFormDTO formDTO) {
ValidatorUtils.validateEntity(formDTO); ValidatorUtils.validateEntity(formDTO);
return new Result<AddAreaCodeDictResultDTO>().ok(areaCodeService.addStreetCommAreaCode(formDTO)); return new Result<String>().ok(areaCodeService.addStreetCommAreaCode(formDTO));
} }
} }

3
epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/AreaCodeService.java

@ -22,7 +22,6 @@ import com.epmet.commons.tools.page.PageData;
import com.epmet.dto.AreaCodeDTO; import com.epmet.dto.AreaCodeDTO;
import com.epmet.dto.form.AddAreaCodeDictFormDTO; import com.epmet.dto.form.AddAreaCodeDictFormDTO;
import com.epmet.dto.form.AreaCodeDictFormDTO; import com.epmet.dto.form.AreaCodeDictFormDTO;
import com.epmet.dto.result.AddAreaCodeDictResultDTO;
import com.epmet.dto.result.AreaCodeDictResultDTO; import com.epmet.dto.result.AreaCodeDictResultDTO;
import com.epmet.entity.AreaCodeEntity; import com.epmet.entity.AreaCodeEntity;
@ -113,5 +112,5 @@ public interface AreaCodeService extends BaseService<AreaCodeEntity> {
* @description 003新增街道或者社区地区编码 * @description 003新增街道或者社区地区编码
* @Date 2021/2/5 17:39 * @Date 2021/2/5 17:39
**/ **/
AddAreaCodeDictResultDTO addStreetCommAreaCode(AddAreaCodeDictFormDTO formDTO); String addStreetCommAreaCode(AddAreaCodeDictFormDTO formDTO);
} }

9
epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java

@ -35,7 +35,6 @@ import com.epmet.dto.AreaCodeChildDTO;
import com.epmet.dto.AreaCodeDTO; import com.epmet.dto.AreaCodeDTO;
import com.epmet.dto.form.AddAreaCodeDictFormDTO; import com.epmet.dto.form.AddAreaCodeDictFormDTO;
import com.epmet.dto.form.AreaCodeDictFormDTO; import com.epmet.dto.form.AreaCodeDictFormDTO;
import com.epmet.dto.result.AddAreaCodeDictResultDTO;
import com.epmet.dto.result.AreaCodeDictResultDTO; import com.epmet.dto.result.AreaCodeDictResultDTO;
import com.epmet.entity.AreaCodeEntity; import com.epmet.entity.AreaCodeEntity;
import com.epmet.redis.AreaCodeRedis; import com.epmet.redis.AreaCodeRedis;
@ -568,7 +567,7 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn
* @Date 2021/2/5 17:39 * @Date 2021/2/5 17:39
**/ **/
@Override @Override
public AddAreaCodeDictResultDTO addStreetCommAreaCode(AddAreaCodeDictFormDTO formDTO) { public String addStreetCommAreaCode(AddAreaCodeDictFormDTO formDTO) {
if (StringUtils.isNotBlank(formDTO.getCode())) { if (StringUtils.isNotBlank(formDTO.getCode())) {
AreaCodeChildDTO areaCodeChildDTO = childDao.selectByCode(formDTO.getCode().trim()); AreaCodeChildDTO areaCodeChildDTO = childDao.selectByCode(formDTO.getCode().trim());
if (null == areaCodeChildDTO) { if (null == areaCodeChildDTO) {
@ -576,7 +575,7 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn
} }
areaCodeChildDTO.setName(formDTO.getName().trim()); areaCodeChildDTO.setName(formDTO.getName().trim());
areaCodeChildService.update(areaCodeChildDTO); areaCodeChildService.update(areaCodeChildDTO);
return new AddAreaCodeDictResultDTO(areaCodeChildDTO.getCode()); return areaCodeChildDTO.getCode();
} }
AreaCodeChildDTO parent = childDao.selectByCode(formDTO.getParentAreaCode().trim()); AreaCodeChildDTO parent = childDao.selectByCode(formDTO.getParentAreaCode().trim());
if (null == parent) { if (null == parent) {
@ -602,11 +601,11 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn
//去掉_UD +1赋值;370124001225_UD 锦源社区 //去掉_UD +1赋值;370124001225_UD 锦源社区
String[] codeArr = maxChildDto.getCode().split(StrConstant.UNDER_LINE); String[] codeArr = maxChildDto.getCode().split(StrConstant.UNDER_LINE);
long code = Long.parseLong(codeArr[NumConstant.ZERO]) + NumConstant.ONE; long code = Long.parseLong(codeArr[NumConstant.ZERO]) + NumConstant.ONE;
areaCodeChildDTO.setCode(String.valueOf(code)); areaCodeChildDTO.setCode(String.valueOf(code).concat("_UD"));
} }
//保存到area_code_child表 //保存到area_code_child表
areaCodeChildService.save(areaCodeChildDTO); areaCodeChildService.save(areaCodeChildDTO);
return new AddAreaCodeDictResultDTO(areaCodeChildDTO.getCode()); return areaCodeChildDTO.getCode();
} }
} }
Loading…
Cancel
Save