完善分享功能

laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java

@@ -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 : "操作成功!");
 	}
 
 }

laws-modules/src/main/java/com/jero/modules/personal/entity/LawsStandardSharing.java

@@ -4,8 +4,10 @@ import java.io.Serializable;
 import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.jero.common.aspect.annotation.Dict;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.experimental.Accessors;
@@ -37,8 +39,8 @@ public class LawsStandardSharing implements Serializable {
     private String id;
 
 	/**分享标准来源、所属板块(1国内、2海外、3企标)*/
-    @ApiModelProperty(value = "分享标准来源、所属板块(1国内、2海外、3企标)")
+    @Dict(dicCode = "standard_source")
-    @NotBlank(message = "source所属板块(1国内、2海外、3企标)不能为空")
+    @ApiModelProperty(value = "分享标准来源、所属板块(1国内、2海外、3企业)")
     private String source;
 
 	/**标准ID*/
@@ -53,7 +55,6 @@ public class LawsStandardSharing implements Serializable {
 
 	/**标准名称*/
     @ApiModelProperty(value = "标准名称")
-    @NotBlank(message = "standardName标准名称不能为空")
     private String standardName;
 
 	/**分享人ID*/
@@ -71,7 +72,6 @@ public class LawsStandardSharing implements Serializable {
 
 	/**接收人姓名*/
     @ApiModelProperty(value = "接收人姓名")
-    @NotBlank(message = "recipientName接收人姓名不能为空")
     private String recipientName;
 
 	/**分享时间*/
@@ -116,8 +116,11 @@ public class LawsStandardSharing implements Serializable {
     @ApiModelProperty(value = "所属部门")
     private String orgCode;
 
-
     /**删除状态(0-正常,1-删除)*/
     @ApiModelProperty(value = "删除状态(0-正常,1-删除)")
     private String delFlag;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "标题（编号+名称）")
+    private String title;
 }

laws-modules/src/main/java/com/jero/modules/personal/service/ILawsStandardSharingService.java

@@ -16,61 +16,17 @@ public interface ILawsStandardSharingService extends IService<LawsStandardSharin
 
     /**
 	 * 分页查询
-	 *
-	 * @param lawsStandardSharing
-	 * @param pageNo
-     * @param pageSize
-	 * @param req
-	 * @return
 	 */
     IPage<LawsStandardSharing> queryPage(LawsStandardSharing lawsStandardSharing, Integer pageNo, Integer pageSize, HttpServletRequest req);
 
-    /**
-     * 列表查询
-     *
-     * @param lawsStandardSharing
-     * @param req
-     * @return
-     */
-    List<LawsStandardSharing> queryList(LawsStandardSharing lawsStandardSharing, HttpServletRequest req);
-
 	/**
 	 * 保存
-	 *
-	 * @param lawsStandardSharing
-	 * @return
 	 */
     void add(LawsStandardSharing lawsStandardSharing);
 
-	/**
-	 * 更新
-	 *
-	 * @param lawsStandardSharing
-	 * @return
-	 */
-    void editById(LawsStandardSharing lawsStandardSharing);
-
-	/**
-	 * 通过id删除
-	 *
-	 * @param id
-	 * @return
-	 */
-    void deleteById(String id);
-
 	/**
 	 * 批量删除
-	 *
-	 * @param ids
-	 * @return
 	 */
     void deleteByIds(List<String> ids);
 
-	/**
-	 * 通过id查询
-	 *
-	 * @param id
-	 * @return
-	 */
-    LawsStandardSharing queryById(String id);
 }

laws-modules/src/main/java/com/jero/modules/personal/service/impl/LawsStandardCollectionServiceImpl.java

@@ -5,6 +5,8 @@ import com.jero.common.system.vo.LoginUser;
 import com.jero.modules.laws.common.service.ILawsCommonService;
 import com.jero.modules.laws.enterprise.entity.EnterpriseStandard;
 import com.jero.modules.laws.enterprise.service.EnterpriseStandardService;
+import com.jero.modules.laws.standard.service.ILawsDomesticStandardService;
+import com.jero.modules.laws.standard.service.ILawsOverseasStandardService;
 import com.jero.modules.personal.entity.LawsStandardCollection;
 import com.jero.modules.personal.mapper.LawsStandardCollectionMapper;
 import com.jero.modules.personal.service.ILawsStandardCollectionService;
@@ -35,10 +37,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 @Transactional(rollbackFor = JeroBootException.class)
 public class LawsStandardCollectionServiceImpl extends ServiceImpl<LawsStandardCollectionMapper, LawsStandardCollection> implements ILawsStandardCollectionService {
 
-//	@Autowired
+	@Autowired
-//	private ILawsDomesticStandardService lawsDomesticStandardService; //国内标准
+	private ILawsDomesticStandardService lawsDomesticStandardService; //国内标准
-//	@Autowired
+	@Autowired
-//	private ILawsOverseasStandardService lawsOverseasStandardService; //海外标准
+	private ILawsOverseasStandardService lawsOverseasStandardService; //海外标准
 	@Autowired
 	private EnterpriseStandardService enterpriseStandardService; //企业标准
 

laws-modules/src/main/java/com/jero/modules/personal/service/impl/LawsStandardSharingServiceImpl.java

@@ -1,6 +1,7 @@
 package com.jero.modules.personal.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.jero.modules.personal.entity.LawsStandardSharing;
 import com.jero.modules.personal.mapper.LawsStandardSharingMapper;
 import com.jero.modules.personal.service.ILawsStandardSharingService;
@@ -29,38 +30,28 @@ public class LawsStandardSharingServiceImpl extends ServiceImpl<LawsStandardShar
 
     /**
      * 分页查询
-     *
-     * @param lawsStandardSharing
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
      */
     @Override
     public IPage<LawsStandardSharing> queryPage(LawsStandardSharing lawsStandardSharing, Integer pageNo, Integer pageSize,
                         HttpServletRequest req) {
         QueryWrapper<LawsStandardSharing> queryWrapper = QueryGenerator.initQueryWrapper(lawsStandardSharing, req.getParameterMap());
         Page<LawsStandardSharing> page = new Page<>(pageNo, pageSize);
-        return page(page, queryWrapper);
+        Page<LawsStandardSharing> sharingPage = page(page, queryWrapper);
+        this.assignment(sharingPage.getRecords());
+        return sharingPage;
+    }
+
+    private void assignment(List<LawsStandardSharing> records) {
+        for (LawsStandardSharing record : records) {
+            String standardNum = record.getStandardNum();
+            String standardName = record.getStandardName();
+            record.setTitle(standardNum + standardName);
+
+        }
     }
 
     /**
-     * 列表查询
-     *
-     * @param lawsStandardSharing
-     * @param req
-     * @return
-     */
-    @Override
-    public List<LawsStandardSharing> queryList(LawsStandardSharing lawsStandardSharing, HttpServletRequest req) {
-        return list(QueryGenerator.initQueryWrapper(lawsStandardSharing, req.getParameterMap()));
-    }
-
-	/**
 	 * 保存
-	 *
-	 * @param lawsStandardSharing
-	 * @return
 	 */
 	@Override
     public void add(LawsStandardSharing lawsStandardSharing) {
@@ -70,49 +61,15 @@ public class LawsStandardSharingServiceImpl extends ServiceImpl<LawsStandardShar
         save(lawsStandardSharing);
     }
 
-	/**
-	 * 更新
-	 *
-	 * @param lawsStandardSharing
-	 * @return
-	 */
-	@Override
-    public void editById(LawsStandardSharing lawsStandardSharing) {
-    	Date now = new Date();
-        lawsStandardSharing.setUpdateTime(now);
-    	saveOrUpdate(lawsStandardSharing);
-    }
-
-	/**
-	 * 通过id删除
-	 *
-	 * @param id
-	 * @return
-	 */
-	@Override
-    public void deleteById(String id) {
-        removeById(id);
-    }
-
 	/**
 	 * 批量删除
-	 *
-	 * @param ids
-	 * @return
 	 */
 	@Override
     public void deleteByIds(List<String> ids) {
-        removeByIds(ids);
+		LambdaUpdateWrapper<LawsStandardSharing> wrapper = new LambdaUpdateWrapper<>();
+		wrapper.in(LawsStandardSharing::getId, ids);
+		wrapper.set(LawsStandardSharing::getDelFlag, "1");
+		update(wrapper);
     }
 
-	/**
-	 * 通过id查询
-	 *
-	 * @param id
-	 * @return
-	 */
-	@Override
-    public LawsStandardSharing queryById(String id) {
-        return getById(id);
-    }
 }