ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改代码中"0"、"1"等改为静态常量

Browse Source
This commit is contained in:
caozhen
2023-09-19 15:07:32 +08:00
parent 95cabb2fdb
commit cd70550f05
15 changed files with 57 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardCollectionController.java
+4 -3
View File
@@ -5,6 +5,7 @@ import javax.servlet.http.HttpServletRequest;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.jero.common.api.vo.Result;
import com.jero.common.constant.CommonConstant;
import com.jero.common.exception.JeroBootException;
import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.MessageUtils;
@@ -87,7 +88,7 @@ public class LawsStandardCollectionController extends JeroController<LawsStandar
if (count > 0){
return Result.error(MessageUtils.getMessage(ResultCommon.CANNOT_DUPLICATE_FAVORITES));
}
lawsStandardCollection.setSource("1");
lawsStandardCollection.setSource(CommonConstant.STANDARD_SOURCE_1);
lawsStandardCollectionService.add(lawsStandardCollection);
return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
}
@@ -126,7 +127,7 @@ public class LawsStandardCollectionController extends JeroController<LawsStandar
if (count > 0){
return Result.error(MessageUtils.getMessage(ResultCommon.CANNOT_DUPLICATE_FAVORITES));
}
lawsStandardCollection.setSource("2");
lawsStandardCollection.setSource(CommonConstant.STANDARD_SOURCE_2);
lawsStandardCollectionService.add(lawsStandardCollection);
return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
}
@@ -165,7 +166,7 @@ public class LawsStandardCollectionController extends JeroController<LawsStandar
if (count > 0){
return Result.error(MessageUtils.getMessage(ResultCommon.CANNOT_DUPLICATE_FAVORITES));
}
lawsStandardCollection.setSource("3");
lawsStandardCollection.setSource(CommonConstant.STANDARD_SOURCE_3);
lawsStandardCollectionService.add(lawsStandardCollection);
return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
}
laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardQaController.java
+2 -1
View File
@@ -6,6 +6,7 @@ import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import com.jero.common.api.vo.Result;
import com.jero.common.constant.CommonConstant;
import com.jero.common.system.vo.LoginUser;
import com.jero.modules.personal.entity.LawsStandardQa;
import com.jero.modules.personal.entity.LawsStandardQuestions;
@@ -78,7 +79,7 @@ public class LawsStandardQaController extends JeroController<LawsStandardQa, ILa
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
//说明是提问人发的消息
lawsStandardQa.setRecordType(sysUser.getId().equals(questions.getQuestionerId()) ? "1" : "2");
lawsStandardQa.setReadingStatus("1");
lawsStandardQa.setReadingStatus(CommonConstant.READING_STATUS_1);
lawsStandardQa.setRecoveryTime(date);
lawsStandardQa.setAnswererId(sysUser.getId());
lawsStandardQa.setAnswererName(sysUser.getRealname());
laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java
+7 -6
View File
@@ -3,6 +3,7 @@ package com.jero.modules.personal.controller;
import java.util.*;
import javax.servlet.http.HttpServletRequest;
import com.jero.common.api.vo.Result;
import com.jero.common.constant.CommonConstant;
import com.jero.common.exception.JeroBootException;
import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.MessageUtils;
@@ -107,7 +108,7 @@ public class LawsStandardSharingController extends JeroController<LawsStandardSh
List<String> recipientIdList = Arrays.asList(recipientId.split(","));
for (int i = 0; i < recipientIdList.size(); i++) {
LawsStandardSharing sharing = new LawsStandardSharing();
sharing.setSource("1");
sharing.setSource(CommonConstant.STANDARD_SOURCE_1);
sharing.setStandardId(lawsStandardSharing.getStandardId());
LawsDomesticStandard standard = lawsDomesticStandardService.queryById(lawsStandardSharing.getStandardId());
sharing.setStandardName(standard.getStandardName());
@@ -120,7 +121,7 @@ public class LawsStandardSharingController extends JeroController<LawsStandardSh
sharing.setSharingTime(date);
sharing.setShareDescription(lawsStandardSharing.getShareDescription());
sharing.setReadingStatus("1");
sharing.setDelFlag("0");
sharing.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
sharings.add(sharing);
}
lawsStandardSharingService.saveBatch(sharings);
@@ -142,7 +143,7 @@ public class LawsStandardSharingController extends JeroController<LawsStandardSh
List<String> recipientIdList = Arrays.asList(recipientId.split(","));
for (int i = 0; i < recipientIdList.size(); i++) {
LawsStandardSharing sharing = new LawsStandardSharing();
sharing.setSource("2");
sharing.setSource(CommonConstant.STANDARD_SOURCE_2);
sharing.setStandardId(lawsStandardSharing.getStandardId());
LawsOverseasStandard standard = lawsOverseasStandardService.queryById(lawsStandardSharing.getStandardId());
sharing.setStandardName(standard.getStandardName());
@@ -155,7 +156,7 @@ public class LawsStandardSharingController extends JeroController<LawsStandardSh
sharing.setSharingTime(date);
sharing.setShareDescription(lawsStandardSharing.getShareDescription());
sharing.setReadingStatus("1");
sharing.setDelFlag("0");
sharing.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
sharings.add(sharing);
}
lawsStandardSharingService.saveBatch(sharings);
@@ -177,7 +178,7 @@ public class LawsStandardSharingController extends JeroController<LawsStandardSh
List<String> recipientIdList = Arrays.asList(recipientId.split(","));
for (int i = 0; i < recipientIdList.size(); i++) {
LawsStandardSharing sharing = new LawsStandardSharing();
sharing.setSource("3");
sharing.setSource(CommonConstant.STANDARD_SOURCE_3);
sharing.setStandardId(lawsStandardSharing.getStandardId());
LawsEnterpriseStandard standard = enterpriseStandardService.getById(lawsStandardSharing.getStandardId());
sharing.setStandardName(standard.getStandardName());
@@ -190,7 +191,7 @@ public class LawsStandardSharingController extends JeroController<LawsStandardSh
sharing.setSharingTime(date);
sharing.setShareDescription(lawsStandardSharing.getShareDescription());
sharing.setReadingStatus("1");
sharing.setDelFlag("0");
sharing.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
sharings.add(sharing);
}
lawsStandardSharingService.saveBatch(sharings);
laws-modules/src/main/java/com/jero/modules/personal/service/impl/LawsStandardCollectionServiceImpl.java
+4 -3
View File
@@ -2,6 +2,7 @@ package com.jero.modules.personal.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.jero.common.constant.CommonConstant;
import com.jero.common.system.vo.LoginUser;
import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard;
import com.jero.modules.laws.standard.service.EnterpriseStandardService;
@@ -64,7 +65,7 @@ public class LawsStandardCollectionServiceImpl extends ServiceImpl<LawsStandardC
for (LawsStandardCollection collection : list) {
String standardId = collection.getStandardId();
String source = collection.getSource();
if ("1".equals(source)){
if (CommonConstant.STANDARD_SOURCE_1.equals(source)){
//查询国内标准数据，赋值给collection
LawsDomesticStandard standard = lawsDomesticStandardService.queryById(standardId);
if (standard != null){
@@ -73,7 +74,7 @@ public class LawsStandardCollectionServiceImpl extends ServiceImpl<LawsStandardC
collection.setReleaseDate(standard.getReleaseDate());
}
}
if ("2".equals(source)){
if (CommonConstant.STANDARD_SOURCE_2.equals(source)){
//查询海外标准数据，赋值给collection
LawsOverseasStandard standard = lawsOverseasStandardService.queryById(standardId);
if (standard != null){
@@ -82,7 +83,7 @@ public class LawsStandardCollectionServiceImpl extends ServiceImpl<LawsStandardC
collection.setReleaseDate(standard.getReleaseDate());
}
}
if ("3".equals(source)){
if (CommonConstant.STANDARD_SOURCE_3.equals(source)){
//查询企业标准数据，赋值给collection
LawsEnterpriseStandard standard = enterpriseStandardService.getById(standardId);
if (standard != null){
laws-modules/src/main/java/com/jero/modules/personal/service/impl/LawsStandardSharingServiceImpl.java
+3 -2
View File
@@ -3,6 +3,7 @@ package com.jero.modules.personal.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.jero.common.constant.CommonConstant;
import com.jero.common.system.vo.LoginUser;
import com.jero.modules.personal.entity.LawsStandardCollection;
import com.jero.modules.personal.entity.LawsStandardSharing;
@@ -44,7 +45,7 @@ public class LawsStandardSharingServiceImpl extends ServiceImpl<LawsStandardShar
wrapper.eq(StringUtils.isNotBlank(lawsStandardSharing.getSource()), LawsStandardSharing::getSource, lawsStandardSharing.getSource());
wrapper.eq(StringUtils.isNotBlank(lawsStandardSharing.getStandardId()), LawsStandardSharing::getSharerId, sysUser.getId());
wrapper.eq(StringUtils.isNotBlank(lawsStandardSharing.getRecipientId()), LawsStandardSharing::getRecipientId, sysUser.getId());
wrapper.eq(LawsStandardSharing::getDelFlag, "0");
wrapper.eq(LawsStandardSharing::getDelFlag, CommonConstant.DEL_FLAG_0.toString());
if (StringUtils.isNotBlank(lawsStandardSharing.getTitle())){
wrapper.last(" AND (standard_number LIKE " + "'%" + lawsStandardSharing.getTitle() + "%'" + " OR standard_name LIKE " + "'%" + lawsStandardSharing.getTitle() + "%'" + ")");
}
@@ -80,7 +81,7 @@ public class LawsStandardSharingServiceImpl extends ServiceImpl<LawsStandardShar
public void deleteByIds(List<String> ids) {
LambdaUpdateWrapper<LawsStandardSharing> wrapper = new LambdaUpdateWrapper<>();
wrapper.in(LawsStandardSharing::getId, ids);
wrapper.set(LawsStandardSharing::getDelFlag, "1");
wrapper.set(LawsStandardSharing::getDelFlag, CommonConstant.DEL_FLAG_1.toString());
update(wrapper);
}