增加内容

feige

2023-12-11 fba5960f0ebcc3c652a04ad7c34cc37908195077

增加内容

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/MarrySelfController.java

@@ -33,7 +33,7 @@
    //新增或修改基本信息
    @PostMapping()
    public AjaxResult updateData(@RequestBody MarryInfoDto marryInfoDto){

        System.out.println("===========");
        return marrySelfService.updateData(marryInfoDto);
    }


 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfFamilyController.java

@@ -1,6 +1,7 @@
package com.ruoyi.web.controller.zhang;

import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.domain.ZfFamily;
import com.ruoyi.domain.dto.UserInfoDto;
import com.ruoyi.service.ZfFamilyService;
import org.springframework.security.core.parameters.P;
@@ -48,11 +49,34 @@
     */
    @PostMapping()
    public AjaxResult addFamilyMember(@RequestBody UserInfoDto userInfoDto){

        return zfFamilyService.addMember(userInfoDto);

    }

    /**
     *
     * @param zfFamily
     * @return
     */
    @PostMapping("/addFam")
    public AjaxResult addFamilyMember(@RequestBody ZfFamily zfFamily){

        return zfFamilyService.addFamily(zfFamily);

    }
    /**
     *
     * @param zfFamily
     * @return
     */
    @PostMapping("/updateFam")
    public AjaxResult updateFamily(@RequestBody ZfFamily zfFamily){

        return zfFamilyService.updateFam(zfFamily);

    }
    /**
     * 删除家庭成员
     */


 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -382,6 +382,7 @@
     */
    public void insertUserRole(SysUser user)
    {

        this.insertUserRole(user.getUserId(), user.getRoleIds());
    }


 ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml

@@ -50,7 +50,7 @@
    
    <select id="selectMenuTreeAll" resultMap="SysMenuResult">
        select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
        from sys_menu m where m.menu_type in ('M', 'C') and m.status = 0 and m.menu_id in (1, 100,101)
        from sys_menu m where m.menu_type in ('M', 'C') and m.status = 0 and m.menu_id in (1, 100,101, 118)
        order by m.parent_id, m.order_num
    </select>
    

 zhang-content/src/main/java/com/ruoyi/service/ZfFamilyService.java

@@ -31,4 +31,9 @@
    AjaxResult addMember(UserInfoDto userInfoDto);

    AjaxResult removeMember(UserInfoDto userInfoDto);


    AjaxResult addFamily(ZfFamily zfFamily);

    AjaxResult updateFam(ZfFamily zfFamily);
}

 zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java

@@ -536,12 +536,14 @@
            //删除es中的数据
            zfPropertys.stream().forEach(zfProperty -> {
                EsModel esModel = esService.findByCtId(zfProperty.getId().intValue(), "家庭资产");
                if(esModel!=null)
                {
                DeleteRequest deleteRequest = new DeleteRequest("allsearchdata", esModel.getId());
                try {
                    restHighLevelClient.delete(deleteRequest,RequestOptions.DEFAULT);
                } catch (IOException e) {
                    throw new RuntimeException(e);
                }
                }}
            });
            return AjaxResult.success();
        }else {

 zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java

@@ -214,7 +214,10 @@
//        String secondFamilyIds = listSecondFamilyIds();
        //要查自己家庭的
        ZInfoUser myself = zInfoUserService.getMyself();
        System.out.println("================");

        Long familyId = myself.getFamilyId();

        //也要查别人授权的
        List<ZAuthority> authority = zAuthorityService.getAuthority();
        List<Long> idList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(EVENT_LIST)).map(ZAuthority::getFid).collect(Collectors.toList());
@@ -277,11 +280,14 @@
            return AjaxResult.success("您没加入到对应的家庭，请联系管理员");
        }
        Long familyId = myself.getFamilyId();
        System.out.println("++++++++++++++++");
        System.out.println(familyId);
        //也要查别人授权的
        List<ZAuthority> authority = zAuthorityService.getAuthority();
        List<Long> idList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(EVENT_LIST)).map(ZAuthority::getFid).collect(Collectors.toList());
        //加上自己家庭的id
        idList.add(familyId);
        System.out.println(idList.size());
//        String familyIds = listFamilyIds();
//        String secondFamilyAuthority = listSecondFamilyIds();
        LambdaQueryWrapper<ZfEvent> lqw = buildCondition(zfEvent, idList);
@@ -292,6 +298,8 @@

        List<ZfEvent> beanRecords = pageResult.getRecords();//得到查询出来的数据

        System.out.println(beanRecords);
        System.out.println(beanRecords.size());
        List<ZfEvent> dtoResult = markOwnData(familyId, beanRecords);

        HashMap<String, Object> data = MapUtils.getResult(pageResult, dtoResult);

 zhang-content/src/main/java/com/ruoyi/service/impl/ZfFamilyServiceImpl.java

@@ -18,6 +18,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@@ -33,6 +34,8 @@
    @Autowired
    ZInfoUserService zInfoUserService;

    @Resource
    ZfFamilyMapper zfFamilyMapper;

    @Override
    public ZfFamily getByName(String familyName) {
@@ -114,4 +117,20 @@
        return AjaxResult.success();

    }

    @Override
    public AjaxResult addFamily(ZfFamily zfFamily) {
        int res = zfFamilyMapper.insert(zfFamily);
        return AjaxResult.success();
    }

    @Override
    public AjaxResult updateFam(ZfFamily zfFamily) {
        int res = zfFamilyMapper.updateById(zfFamily);

        if(res!=0) {
            return AjaxResult.success();
        }else
            return  AjaxResult.error("修改失败,家庭号不能重复");
    }
}

 zhang-content/src/main/java/com/ruoyi/service/impl/ZfRegisterServiceImpl.java

@@ -28,6 +28,8 @@
    public SysUserRole1 selectUserRole(Long userId) {
        LambdaQueryWrapper<SysUserRole1> lqw = new LambdaQueryWrapper<>();
        lqw.eq(SysUserRole1::getUserId,userId);
        return getOne(lqw);
        SysUserRole1 sys = getOne(lqw);
        System.out.println(sys);
        return  sys;
    }
}