智慧农业后台管理
guoshilong
2022-07-21 f6d0e3738bba6c4651249c3a934893f2376e02cf
删除多余api,添加农场省市区
5 files modified
53 ■■■■ changed files
src/main/java/org/springblade/modules/farm/entity/Farm.java 19 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/farm/mapper/FarmMapper.xml 6 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/system/controller/UserController.java 11 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/system/service/IUserService.java 7 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java 10 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/farm/entity/Farm.java
@@ -84,4 +84,23 @@
     */
    private String deptId;
    /**
     * 省编号
     */
    private String province;
    /**
     * 市编号
     */
    private String city;
    /**
     * 区编号
     */
    private String district;
    /**
     * 360全景url
     */
    private String panoramic;
}
src/main/java/org/springblade/modules/farm/mapper/FarmMapper.xml
@@ -52,6 +52,9 @@
        slogan = #{farm.slogan},
        introduce = #{farm.introduce},
        picture = #{farm.picture},
        province = #{farm.province},
        city = #{farm.city},
        district = #{farm.district},
        <if test="farm.position!=null and farm.position!=''">
            position = ST_GeomFromText(${farm.position}),
        </if>
@@ -84,6 +87,9 @@
               slogan,
               introduce,
               picture,
               province,
               city,
               district,
               ST_ASTEXT(position) as position,dept_id
        from
            sys_farm
src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -342,15 +342,4 @@
    public R getUserList(UserVO user){
        return R.data(userService.getUserList(user));
    }
    /**
     * 根据用户id查询用户信息
     * @param user
     * @return
     */
    @PostMapping("/updateUserPersonal")
    @ApiOperation(value = "修改用户信息", notes = "传入user,id必须")
    public R updateUserPersonal( User user){
        return R.data(userService.updateUserPersonal(user));
    }
}
src/main/java/org/springblade/modules/system/service/IUserService.java
@@ -213,11 +213,4 @@
     * @return
     */
    List<User> getUserList(UserVO user);
    /**
     * 根据用户id查询用户信息
     * @param user
     * @return
     */
    int updateUserPersonal(User user);
}
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -442,14 +442,4 @@
        //查询用户信息并返回
        return baseMapper.getUserList(user);
    }
    /**
     * 根据用户id修改用户信息
     * @param user
     * @return
     */
    @Override
    public int updateUserPersonal(User user) {
        return baseMapper.updateById(user);
    }
}