From fba5960f0ebcc3c652a04ad7c34cc37908195077 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期一, 11 十二月 2023 21:45:05 +0800
Subject: [PATCH] 增加内容
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZfFamilyServiceImpl.java | 19 +++++++++
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/MarrySelfController.java | 2
zhang-content/src/main/java/com/ruoyi/service/ZfFamilyService.java | 5 ++
zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java | 8 ++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfFamilyController.java | 24 ++++++++++++
zhang-content/src/main/java/com/ruoyi/service/impl/ZfRegisterServiceImpl.java | 4 +
ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml | 2
zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java | 4 +
9 files changed, 65 insertions(+), 4 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/MarrySelfController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/MarrySelfController.java
index c8edbbc..940110d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/MarrySelfController.java
+++ b/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);
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfFamilyController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfFamilyController.java
index 13bc437..cd24e07 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfFamilyController.java
+++ b/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);
+
+ }
+ /**
* 鍒犻櫎瀹跺涵鎴愬憳
*/
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index 6f30772..638966a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/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());
}
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
index 4aa4923..61d401d 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
+++ b/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>
diff --git a/zhang-content/src/main/java/com/ruoyi/service/ZfFamilyService.java b/zhang-content/src/main/java/com/ruoyi/service/ZfFamilyService.java
index d74a482..89f16d0 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/ZfFamilyService.java
+++ b/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);
}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
index 29b9fbb..1c33943 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
+++ b/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 {
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java
index 9294d66..70e09c1 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java
+++ b/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());
//鍔犱笂鑷繁瀹跺涵鐨刬d
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);
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfFamilyServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfFamilyServiceImpl.java
index d76aa4f..9111359 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfFamilyServiceImpl.java
+++ b/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("淇敼澶辫触,瀹跺涵鍙蜂笉鑳介噸澶�");
+ }
}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfRegisterServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfRegisterServiceImpl.java
index 188f0f4..6a81422 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfRegisterServiceImpl.java
+++ b/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;
}
}
--
Gitblit v1.9.1