用户添加水库堤防标识

guoshilong

2024-04-15 8fc0e15e7f70505765b654731877202925e3777e

用户添加水库堤防标识

 skjcmanager/skjcmanager-auth/src/main/java/cn/gistack/auth/service/BladeUserDetailsServiceImpl.java

@@ -182,10 +182,16 @@
                userInfo.getDetail().set("adCodeBase", "");
                userInfo.getDetail().set("parentDept",0);
            } else {
                userInfo.getDetail().set("adCodeBase",attResManagePersonClient.getAdBaseById(deptRes.getData().getAdCode()).getData());
                //根据用户标识类型判断是水库还是堤防
                if (user.getType().equals("堤防")){
                    //堤防需要从自己的库中获取行政区划
                    userInfo.getDetail().set("adCodeBase",attResManagePersonClient.getYwxtAdBaseById(deptRes.getData().getAdCode()).getData());
                }else{
                    //水库从中台表中获取行政区划
                    userInfo.getDetail().set("adCodeBase",attResManagePersonClient.getAdBaseById(deptRes.getData().getAdCode()).getData());
                }
                userInfo.getDetail().set("parentDept",deptRes.getData().getParentId());
            }

            String collectResIds = collectClient.getMyCollect(user.getId().toString());
            userInfo.getDetail().set("collect",collectResIds);


 skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sjztmd/feign/IAttResManagePersonClient.java

@@ -28,6 +28,7 @@
    String API_PREFIX = "/client";
    String QUERY_LIST_BY_PHONE = API_PREFIX + "/queryListByPhone";
    String GET_AD_BASE = API_PREFIX + "/getAdBaseById";
    String GET_YWXT_AD_BASE = API_PREFIX + "/getYwxtAdBaseById";
    String GET_PERSONG_LIST_BY_RES_GUID = API_PREFIX + "/getPersonListByResGuid";
    String GET_USER_LIST_BY_RES_GUID = API_PREFIX + "/getUserListByResGuid";
    String SYNCHARONIZATION_ADD_USER = API_PREFIX + "/synchronizationAddUser";
@@ -40,6 +41,9 @@

    @GetMapping(GET_AD_BASE)
    R getAdBaseById(@RequestParam("guid") String guid);

    @GetMapping(GET_YWXT_AD_BASE)
    R getYwxtAdBaseById(@RequestParam("guid")String guid);

    /**
     * 根据水库编号及责任人类型查询相关责任人信息
@@ -80,4 +84,5 @@
     */
    @GetMapping(GET_CITY_COUNTY_PERSONG_LIST_BY_RES_GUID)
    List<PersonVO> getCityCountyPersonListByResGuid(@RequestParam("res_cd") String res_cd);

}

 skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sjztmd/feign/IAttResManagePersonClientFallback.java

@@ -27,6 +27,11 @@
    }

    @Override
    public R getYwxtAdBaseById(String guid) {
        return R.fail("获取数据失败");
    }

    @Override
    public List<PersonVO> getPersonListByResGuid(String res_cd, String personList) {
        return null;
    }

 skjcmanager/skjcmanager-service-api/skjcmanager-user-api/src/main/java/cn/gistack/system/user/entity/User.java

@@ -98,4 +98,7 @@
    private String maced;
    private String encdata;

    //水库或是堤防用户标识
    private String type;

}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/feign/AttResManagePersonClient.java

@@ -63,6 +63,17 @@
        return R.data(null);
    }

    @Override
    public R getYwxtAdBaseById(String guid) {
        AttAdBase attAdBase = new AttAdBase();
        attAdBase.setGuid(guid);
        List<AttAdBase> attAdBases =  adBaseService.getYwxtAdList(guid);
        if (attAdBases.size() > 0)
            return R.data(attAdBases.get(0));

        return R.data(null);
    }

    /**
     * 查询责任人相关信息
     * @param guid

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttAdBaseMapper.java

@@ -48,4 +48,6 @@


    AttAdBase getYwxtAdDetail(@Param("adCode") String adCode);

    List<AttAdBase> getYwxtAdList(@Param("adCode") String guid);
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttAdBaseMapper.xml

@@ -170,6 +170,9 @@
    <select id="getYwxtAdDetail" resultType="cn.gistack.sm.sjztmd.entity.AttAdBase">
        select * from ywxt."att_ad_base" where "guid" = #{adCode}
    </select>
    <select id="getYwxtAdList" resultType="cn.gistack.sm.sjztmd.entity.AttAdBase">
        SELECT * FROM YWXT."att_ad_base" WHERE "ad_code" = #{adCode}
    </select>


</mapper>

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttAdBaseService.java

@@ -48,4 +48,6 @@
    String getAdGradByAdCode(String adCode);

    AttAdBase getYwxtAdDetail(String adCode);

    List<AttAdBase> getYwxtAdList(String guid);
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttAdBaseServiceImpl.java

@@ -103,6 +103,11 @@
        return baseMapper.getYwxtAdDetail(adCode);
    }

    @Override
    public List<AttAdBase> getYwxtAdList(String guid) {
        return baseMapper.getYwxtAdList(guid);
    }


    @Override
    public boolean save(AttAdBase entity) {

 skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/excel/UserExcel.java

@@ -94,4 +94,8 @@
    @ExcelProperty("生日")
    private Date birthday;

    @ColumnWidth(20)
    @ExcelProperty("类型(堤防/水库)")
    private String type;

}

 skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/service/impl/UserServiceImpl.java

@@ -412,6 +412,7 @@
            if (!AuthUtil.isAdministrator() || StringUtil.isBlank(user.getTenantId())) {
                user.setTenantId(AuthUtil.getTenantId());
            }
            user.setType(userExcel.getType());
            // 覆盖数据
            if (isCovered) {
                // 查询用户是否存在
@@ -423,7 +424,9 @@
                }
            }
            // 获取默认密码配置
            String initPassword = ParamCache.getValue(DEFAULT_PARAM_PASSWORD);
//            String initPassword = ParamCache.getValue(DEFAULT_PARAM_PASSWORD);

            String initPassword = CommonConstant.DEFAULT_PASSWORD;
            user.setPassword(initPassword);
            this.submit(user);
        });