完善分享功能

This commit is contained in:
caozhen
2023-09-12 13:48:13 +08:00
parent a66aac8deb
commit 4b235fdee1
5 changed files with 76 additions and 136 deletions
@@ -4,9 +4,19 @@ import java.util.*;
import javax.servlet.http.HttpServletRequest;
import com.jero.common.api.vo.Result;
import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.MessageUtils;
import com.jero.modules.laws.common.constant.ResultCommon;
import com.jero.modules.laws.enterprise.entity.EnterpriseStandard;
import com.jero.modules.laws.enterprise.service.EnterpriseStandardService;
import com.jero.modules.laws.standard.entity.LawsDomesticStandard;
import com.jero.modules.laws.standard.entity.LawsOverseasStandard;
import com.jero.modules.laws.standard.service.ILawsDomesticStandardService;
import com.jero.modules.laws.standard.service.ILawsOverseasStandardService;
import com.jero.modules.personal.entity.LawsStandardSharing;
import com.jero.modules.personal.service.ILawsStandardSharingService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.jero.modules.system.entity.SysUser;
import com.jero.modules.system.service.ISysUserService;
import lombok.extern.slf4j.Slf4j;
import com.jero.common.system.base.controller.JeroController;
import org.apache.shiro.SecurityUtils;
@@ -33,6 +43,15 @@ import org.apache.poi.ss.formula.functions.T;
public class LawsStandardSharingController extends JeroController<LawsStandardSharing, ILawsStandardSharingService> {
@Autowired
private ILawsStandardSharingService lawsStandardSharingService;
@Autowired
private ISysUserService sysUserService;
@Autowired
private ILawsDomesticStandardService lawsDomesticStandardService; //国内标准
@Autowired
private ILawsOverseasStandardService lawsOverseasStandardService; //海外标准
@Autowired
private EnterpriseStandardService enterpriseStandardService; //企业标准
/**
* 分页列表查询
@@ -77,22 +96,23 @@ public class LawsStandardSharingController extends JeroController<LawsStandardSh
@PostMapping(value = "/domestic/add")
public Result<T> domesticAdd(@Validated @RequestBody LawsStandardSharing lawsStandardSharing) {
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
SysUser user = sysUserService.getById(sysUser.getId());
String recipientId = lawsStandardSharing.getRecipientId();
String recipientName = lawsStandardSharing.getRecipientName();
Date date = new Date();
List<LawsStandardSharing> sharings = new ArrayList<>();
List<String> recipientIdList = Arrays.asList(recipientId.split(","));
List<String> recipientNameList = Arrays.asList(recipientName.split(","));
for (int i = 0; i < recipientIdList.size(); i++) {
LawsStandardSharing sharing = new LawsStandardSharing();
sharing.setSource(lawsStandardSharing.getSource());
sharing.setSource("1");
sharing.setStandardId(lawsStandardSharing.getStandardId());
sharing.setStandardName(lawsStandardSharing.getStandardName());
LawsDomesticStandard standard = lawsDomesticStandardService.queryById(lawsStandardSharing.getStandardId());
sharing.setStandardName(standard.getStandardName());
sharing.setStandardNum(lawsStandardSharing.getStandardNum());
sharing.setSharerId(sysUser.getId());
sharing.setSharerName(lawsStandardSharing.getSharerName());
sharing.setSharerName(user.getNameWorkNo());
sharing.setRecipientId(recipientIdList.get(i));
sharing.setRecipientName(recipientNameList.get(i));
SysUser userServiceById = sysUserService.getById(recipientIdList.get(i));
sharing.setRecipientName(userServiceById.getNameWorkNo());
sharing.setSharingTime(date);
sharing.setShareDescription(lawsStandardSharing.getShareDescription());
sharing.setReadingStatus("1");
@@ -100,7 +120,7 @@ public class LawsStandardSharingController extends JeroController<LawsStandardSh
sharings.add(sharing);
}
lawsStandardSharingService.saveBatch(sharings);
return Result.OK("操作成功!");
return Result.OK(MessageUtils.getLanguage().equals("EN") ? ResultCommon.OK : "操作成功!");
}
/**
@@ -111,22 +131,23 @@ public class LawsStandardSharingController extends JeroController<LawsStandardSh
@PostMapping(value = "/overseas/add")
public Result<T> overseasAdd(@Validated @RequestBody LawsStandardSharing lawsStandardSharing) {
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
SysUser user = sysUserService.getById(sysUser.getId());
String recipientId = lawsStandardSharing.getRecipientId();
String recipientName = lawsStandardSharing.getRecipientName();
Date date = new Date();
List<LawsStandardSharing> sharings = new ArrayList<>();
List<String> recipientIdList = Arrays.asList(recipientId.split(","));
List<String> recipientNameList = Arrays.asList(recipientName.split(","));
for (int i = 0; i < recipientIdList.size(); i++) {
LawsStandardSharing sharing = new LawsStandardSharing();
sharing.setSource(lawsStandardSharing.getSource());
sharing.setSource("2");
sharing.setStandardId(lawsStandardSharing.getStandardId());
sharing.setStandardName(lawsStandardSharing.getStandardName());
LawsOverseasStandard standard = lawsOverseasStandardService.queryById(lawsStandardSharing.getStandardId());
sharing.setStandardName(standard.getStandardName());
sharing.setStandardNum(lawsStandardSharing.getStandardNum());
sharing.setSharerId(sysUser.getId());
sharing.setSharerName(lawsStandardSharing.getSharerName());
sharing.setSharerName(user.getNameWorkNo());
sharing.setRecipientId(recipientIdList.get(i));
sharing.setRecipientName(recipientNameList.get(i));
SysUser userServiceById = sysUserService.getById(recipientIdList.get(i));
sharing.setRecipientName(userServiceById.getNameWorkNo());
sharing.setSharingTime(date);
sharing.setShareDescription(lawsStandardSharing.getShareDescription());
sharing.setReadingStatus("1");
@@ -134,7 +155,7 @@ public class LawsStandardSharingController extends JeroController<LawsStandardSh
sharings.add(sharing);
}
lawsStandardSharingService.saveBatch(sharings);
return Result.OK("操作成功!");
return Result.OK(MessageUtils.getLanguage().equals("EN") ? ResultCommon.OK : "操作成功!");
}
/**
@@ -145,22 +166,23 @@ public class LawsStandardSharingController extends JeroController<LawsStandardSh
@PostMapping(value = "/enterprise/add")
public Result<T> enterpriseAdd(@Validated @RequestBody LawsStandardSharing lawsStandardSharing) {
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
SysUser user = sysUserService.getById(sysUser.getId());
String recipientId = lawsStandardSharing.getRecipientId();
String recipientName = lawsStandardSharing.getRecipientName();
Date date = new Date();
List<LawsStandardSharing> sharings = new ArrayList<>();
List<String> recipientIdList = Arrays.asList(recipientId.split(","));
List<String> recipientNameList = Arrays.asList(recipientName.split(","));
for (int i = 0; i < recipientIdList.size(); i++) {
LawsStandardSharing sharing = new LawsStandardSharing();
sharing.setSource(lawsStandardSharing.getSource());
sharing.setSource("3");
sharing.setStandardId(lawsStandardSharing.getStandardId());
sharing.setStandardName(lawsStandardSharing.getStandardName());
EnterpriseStandard standard = enterpriseStandardService.getById(lawsStandardSharing.getStandardId());
sharing.setStandardName(standard.getStandardName());
sharing.setStandardNum(lawsStandardSharing.getStandardNum());
sharing.setSharerId(sysUser.getId());
sharing.setSharerName(lawsStandardSharing.getSharerName());
sharing.setSharerName(user.getNameWorkNo());
sharing.setRecipientId(recipientIdList.get(i));
sharing.setRecipientName(recipientNameList.get(i));
SysUser userServiceById = sysUserService.getById(recipientIdList.get(i));
sharing.setRecipientName(userServiceById.getNameWorkNo());
sharing.setSharingTime(date);
sharing.setShareDescription(lawsStandardSharing.getShareDescription());
sharing.setReadingStatus("1");
@@ -168,7 +190,7 @@ public class LawsStandardSharingController extends JeroController<LawsStandardSh
sharings.add(sharing);
}
lawsStandardSharingService.saveBatch(sharings);
return Result.OK("操作成功!");
return Result.OK(MessageUtils.getLanguage().equals("EN") ? ResultCommon.OK : "操作成功!");
}
/**
@@ -179,10 +201,10 @@ public class LawsStandardSharingController extends JeroController<LawsStandardSh
@PostMapping(value = "/deleteBatch")
public Result<T> deleteBatch(@RequestBody Map<String, String> map) {
if(!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))){
return Result.error("请选择数据!");
return Result.error(MessageUtils.getLanguage().equals("EN") ? "Please select data!" : "请选择数据!");
}
this.lawsStandardSharingService.deleteByIds(Arrays.asList(map.get("ids").split(",")));
return Result.OK("批量删除成功!");
return Result.OK(MessageUtils.getLanguage().equals("EN") ? ResultCommon.OK : "操作成功!");
}
}