no
DESKTOP-71BH0QO\L、ming
2021-04-08 41c0c9fa752aebd506315612632078ef01343f56
no
4个文件已修改
81 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/StreetApi.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/R.java 61 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/StreetApi.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComStreetServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/StreetApi.java
@@ -57,18 +57,7 @@
            administratorsUserVO.setStatus(1);
            administratorsUserVO.setRoleId(999999999l);
            administratorsUserVO.setUserId(this.getUserId());
            R r1 = userService.addUserBackstage(administratorsUserVO);
            if (!R.isOk(r1)) {
                ComStreetVO paramStreet = new ComStreetVO();
                paramStreet.setProvinceCode(comStreetVO.getProvinceCode());
                paramStreet.setCityCode(comStreetVO.getCityCode());
                paramStreet.setAreaCode(comStreetVO.getAreaCode());
                paramStreet.setName(comStreetVO.getName());
                List<ComStreetVO> comStreetVOS = JSONObject.parseArray(JSONObject.toJSONString(r.getData()), ComStreetVO.class);
                List<Long> streetIds = comStreetVOS.stream().map(ComStreetVO::getStreetId).collect(Collectors.toList());
                communityService.delectStreat(streetIds);
            }
            userService.addUserBackstage(administratorsUserVO);
        }
        return r;
    }
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/R.java
@@ -6,6 +6,7 @@
import org.springframework.util.ObjectUtils;
import java.io.Serializable;
import java.lang.reflect.Field;
/**
 * 响应信息主体
@@ -13,14 +14,17 @@
 * @author HUANGHONGFA
 */
@Data
public class R<T> implements Serializable
{
public class R<T> implements Serializable {
    private static final long serialVersionUID = 1L;
    /** 成功 */
    /**
     * 成功
     */
    public static final int SUCCESS = Constants.SUCCESS;
    /** 失败 */
    /**
     * 失败
     */
    public static final int FAIL = Constants.FAIL;
    private int code;
@@ -29,52 +33,43 @@
    private T data;
    public static <T> R<T> ok()
    {
    public static <T> R<T> ok() {
        return restResult(null, SUCCESS, "success");
    }
    public static <T> R<T> ok(T data)
    {
    public static <T> R<T> ok(T data) {
        return restResult(data, SUCCESS, "success");
    }
    public static <T> R<T> ok(T data, String msg)
    {
    public static <T> R<T> ok(T data, String msg) {
        return restResult(data, SUCCESS, msg);
    }
    public static <T> R<T> fail()
    {
    public static <T> R<T> fail() {
        return restResult(null, FAIL, null);
    }
    public static <T> R<T> fail(String msg)
    {
    public static <T> R<T> fail(String msg) {
        return restResult(null, FAIL, msg);
    }
    public static <T> R<T> fail(T data)
    {
    public static <T> R<T> fail(T data) {
        return restResult(data, FAIL, null);
    }
    public static <T> R<T> fail(T data, String msg)
    {
    public static <T> R<T> fail(T data, String msg) {
        return restResult(data, FAIL, msg);
    }
    public static <T> R<T> fail(int code, String msg)
    {
    public static <T> R<T> fail(int code, String msg) {
        return restResult(null, code, msg);
    }
    public static <T> R<T> fail(int code)
    {
    public static <T> R<T> fail(int code) {
        return restResult(null, code, null);
    }
    private static <T> R<T> restResult(T data, int code, String msg)
    {
    private static <T> R<T> restResult(T data, int code, String msg) {
        R<T> apiResult = new R<>();
        apiResult.setCode(code);
        apiResult.setData(data);
@@ -89,12 +84,30 @@
    /**
     * 请求是否成功
     *
     * @return
     */
    public static boolean isOk(R r){
        return r.code==Constants.SUCCESS.intValue();
    }
    /**
     * code
     *
     * @return
     */
    public static Integer getCode(R r) {
        String code = null;
        try {
            Field field = r.getData().getClass().getDeclaredField("code");
            code = field.get("code").toString();
        } catch (IllegalAccessException e) {
            e.printStackTrace();
        } catch (NoSuchFieldException e) {
            e.printStackTrace();
        }
        return Integer.valueOf(code);
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/StreetApi.java
@@ -33,8 +33,7 @@
    @PostMapping("addstreet")
    @Transactional(rollbackFor = Exception.class)
    public R addStreet(@RequestBody ComStreetVO comStreetVO) {
        R r = comStreetService.addStreet(comStreetVO);
        return R.ok(r);
        return comStreetService.addStreet(comStreetVO);
    }
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComStreetServiceImpl.java
@@ -55,7 +55,7 @@
        param.eq(ComStreetDO::getAreaCode, comStreetVO.getAreaCode());
        Integer integer = comStreetDAO.selectCount(param);
        if (integer > 0) {
            return R.fail("街道已经存在");
            return R.fail(500, "街道已经存在");
        }
        BeanUtils.copyProperties(comStreetVO, comStreetDO);
        int insert = comStreetDAO.insert(comStreetDO);
@@ -64,7 +64,7 @@
            BeanUtils.copyProperties(comStreetDO1, comStreetVO);
            return R.ok(comStreetVO);
        }
        return R.fail();
        return R.fail(500,"");
    }