Browse Source

优化了文件上传目录

dev-V1.0.1
ganhao 6 months ago
parent
commit
5f75bebd9d
  1. 13
      zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/common/config/RuoYiConfig.java
  2. 12
      zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/common/util/file/FileUploadUtils.java
  3. 924
      zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppLawEnforcementRegistrationController.java
  4. 5
      zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EnforcementEducationServicesVo.java
  5. 12
      zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EnforcementEducationServicesMapper.java
  6. 6
      zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/common/impl/FileUploadApiImpl.java
  7. 55
      zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementEducationServicesServiceImpl.java
  8. 13
      zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementEducationServicesMapper.xml
  9. 4
      zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev.yml

13
zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/common/config/RuoYiConfig.java

@ -81,7 +81,7 @@ public class RuoYiConfig
/**
* 获取上传路径(兼容旧代码)
*/
public static String getProfile()
public static String getUploadPath()
{
// 需要通过 Spring 上下文获取 bean,这里提供静态访问方式
return SpringUtils.getBean(RuoYiConfig.class).getFile().getUploadPath();
@ -100,7 +100,7 @@ public class RuoYiConfig
*/
public static String getAvatarPath()
{
return getProfile() + "/avatar";
return getUploadPath() + "/avatar";
}
/**
@ -108,14 +108,7 @@ public class RuoYiConfig
*/
public static String getDownloadPath()
{
return getProfile() + "/download/";
return getUploadPath() + "/download/";
}
/**
* 获取上传路径
*/
public static String getUploadPath()
{
return getProfile() + "/upload";
}
}

12
zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/common/util/file/FileUploadUtils.java

@ -40,7 +40,7 @@ public class FileUploadUtils
/**
* 默认上传的地址
*/
private static String defaultBaseDir = RuoYiConfig.getProfile();
private static String defaultBaseDir = RuoYiConfig.getUploadPath();
private static int counter = 0;
@ -150,9 +150,15 @@ public class FileUploadUtils
private static final String getPathFileName(String uploadDir, String fileName) throws IOException
{
int dirLastIndex = RuoYiConfig.getProfile().length() + 1;
int dirLastIndex = RuoYiConfig.getUploadPath().length() + 1;
String currentDir = StringUtils.substring(uploadDir, dirLastIndex);
String pathFileName = Constants.RESOURCE_PREFIX + "/" + currentDir + "/" + fileName;
// 如果 currentDir 为空,则直接使用 RESOURCE_PREFIX + fileName
String pathFileName;
if (StringUtils.isEmpty(currentDir)) {
pathFileName = Constants.RESOURCE_PREFIX + "/" + fileName;
} else {
pathFileName = Constants.RESOURCE_PREFIX + "/" + currentDir + "/" + fileName;
}
return pathFileName;
}

924
zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppLawEnforcementRegistrationController.java

@ -0,0 +1,924 @@
//package com.zdxt.enforcementcode.controller.app.enforcement;
//
//
//import com.zdxt.enforcementcode.domain.EnforcementRegistration;
//import com.zdxt.enforcementcode.service.IEnterpriseEvaluateService;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.stereotype.Controller;
//import org.springframework.ui.ModelMap;
//import org.springframework.web.bind.annotation.*;
//
//import java.time.Instant;
//import java.time.LocalDate;
//import java.time.ZoneId;
//import java.time.temporal.ChronoUnit;
//import java.util.*;
//
//
///**
// * 执法端-执法登记Controller
// *
// * @author chenrui
// * @date 2024-02-23
// */
//@Controller
//@RequestMapping("/app/code/registration")
//public class AppLawEnforcementRegistrationController extends BaseController
//{
// private String prefix = "project/code/registration";
//
// @Autowired private IEnforcementRegistrationService enforcementRegistrationService;
// @Autowired private IEnterpriseLawEnforcementService enterpriseLawEnforcementService;
// @Autowired private ILinkageDictService iLinkageDictService;
// @Autowired private IEnterpriseComplaintService enterpriseComplaintService;
// @Autowired private IEnterpriseInformationService iEnterpriseInformationService;
// @Autowired private IEnterpriseEvaluateService enterpriseEvaluateService;
// @Autowired private IZqyjjdm137344Service iZqyjjdm137344Service;
// @Autowired private UserApi userApi;
// @Autowired private DeptApi deptApi;
// @Autowired private DictDataApi dictDataApi;
// @Autowired
// private IUserService userService;
//
// @RequiresPermissions("code:registration:view")
// @GetMapping()
// public String registration()
// {
// return prefix + "/registration";
// }
//
// /**
// * 查询执法端-执法登记列表
// */
// @RequiresPermissions("code:registration:list")
// @PostMapping("/list")
// @ResponseBody
// public TableDataInfo list(EnforcementRegistration enforcementRegistration)
// {
// startPage();
// List<EnforcementRegistration> list = enforcementRegistrationService.selectEnforcementRegistrationList(enforcementRegistration);
// return getDataTable(list);
// }
// /**
// * 查询执法端-执法登记列表
// */
// @GetMapping("/selectList")
// @ResponseBody
// public ZDResponse selectList(EnforcementRegistration enforcementRegistration)
// {
// List<EnforcementRegistration> list = enforcementRegistrationService.selectEnforcementRegistrationList(enforcementRegistration);
// DictDataBean dictParams = new DictDataBean();
// dictParams.setDictType("check_category");
// List<DictDataBean> dicts = dictDataApi.getDictData(dictParams);
// for (EnforcementRegistration ee : list) {
// // 判断是否投诉
// EnterpriseComplaint params = new EnterpriseComplaint();
// params.setRelId(ee.getId());
// params.setComOrOpi(1);
// List<EnterpriseComplaint> enterpriseComplaints = enterpriseComplaintService.selectEnterpriseComplaintList(params);
// if (null!=enterpriseComplaints && enterpriseComplaints.size()>0) {
// ee.setComOrOpi(1);
// } else {
// ee.setComOrOpi(0);
// }
//
// // 执法类别
// for (DictDataBean dict : dicts) {
// if (dict.getDictValue().equals(ee.getCheckCategory())) {
// ee.setCheckCategoryText(dict.getDictLabel());
// }
// }
//
// // 执法人员1需要展示用户名+执法码
// UserBean userBean = userApi.getUserByUserId(ee.getLawEnforcerId());
// String lawCN = StringUtils.isEmpty(userBean.getLawCertificateNum())?"":userBean.getLawCertificateNum();
// ee.setLawEnforcer(userBean.getUserName() +" "+ lawCN);
// // 执法人员2需要展示用户名+执法码
// List<String> lawTwoList = new ArrayList<>();
// List<UserBean> userBeans = new ArrayList<>();
// if (StringUtils.isNotEmpty(ee.getLawEnforcerIdTwo())) {
// userBeans = userApi.getUserByUserIds(ee.getLawEnforcerIdTwo());
// }
// for (UserBean ub : userBeans) {
// String lawCertificateNum = StringUtils.isEmpty(ub.getLawCertificateNum())?"":ub.getLawCertificateNum();
// lawTwoList.add(ub.getUserName() +" "+ lawCertificateNum);
// }
// ee.setLawEnforcer2List(lawTwoList);
// }
//
// return ZDResponse.success("获取执法登录信息",list);
// }
//
//
// /**
// * 查询执法端-执法登记列表
// */
//// @RequiresPermissions("code:registration:list")
// @PostMapping("/queryList")
// @ResponseBody
// public TableDataInfo queryList(@RequestBody EnforcementRegistration enforcementRegistration)
// {
//// startPage();
// int totalNum = enforcementRegistrationService.countEnforcementRegistrationList(enforcementRegistration);
// List<EnforcementRegistration> list = enforcementRegistrationService.selectEnforcementRegistrationList(enforcementRegistration);
// DictDataBean dictParams = new DictDataBean();
// dictParams.setDictType("check_category");
// List<DictDataBean> dicts = dictDataApi.getDictData(dictParams);
// for (EnforcementRegistration ee : list) {
// // 判断是否投诉
// EnterpriseComplaint params = new EnterpriseComplaint();
// params.setRelId(ee.getId());
// params.setComOrOpi(1);
// List<EnterpriseComplaint> enterpriseComplaints = enterpriseComplaintService.selectEnterpriseComplaintList(params);
// if (null!=enterpriseComplaints && enterpriseComplaints.size()>0) {
// ee.setComOrOpi(1);
// } else {
// ee.setComOrOpi(0);
// }
//
// // 执法类别
// for (DictDataBean dict : dicts) {
// if (dict.getDictValue().equals(ee.getCheckCategory())) {
// ee.setCheckCategoryText(dict.getDictLabel());
// }
// }
//
// // 执法人员1需要展示用户名+执法码 没有执法码展示加密手机号
// UserBean userBean = userApi.getUserByUserId(ee.getLawEnforcerId());
// String lawCN =userBean.getUserName() +" "+userBean.getLawCertificateNum();
// if(StringUtils.isEmpty(userBean.getLawCertificateNum())){
// lawCN=userBean.getUserName() +" "+ CommonUtil.encryptPhone(userBean.getPhonenumber());
// }
// ee.setLawEnforcer(lawCN);
//
// // 执法人员2需要展示用户名+执法码 没有执法码展示加密手机号
// List<String> lawTwoList = new ArrayList<>();
// List<UserBean> userBeans = new ArrayList<>();
// if (StringUtils.isNotEmpty(ee.getLawEnforcerIdTwo())) {
// userBeans = userApi.getUserByUserIds(ee.getLawEnforcerIdTwo());
// }
//// String tmpUserShow = "";
// for (UserBean ub : userBeans) {
// String temp=ub.getUserName() +" "+ub.getLawCertificateNum();
// if(StringUtils.isEmpty(ub.getLawCertificateNum())){
// temp=ub.getUserName() +" "+ CommonUtil.encryptPhone(ub.getPhonenumber());
// }
// lawTwoList.add(temp);
// }
//// if (tmpUserShow.length() > 0) {
//// tmpUserShow = tmpUserShow.substring(0, tmpUserShow.length()-1);
//// }
// ee.setLawEnforcer2List(lawTwoList);
//
// // 判断超时多少天
// Instant instant = ee.getEnforcementTime().toInstant();
// ZoneId zoneId = ZoneId.systemDefault();
// LocalDate startDate = instant.atZone(zoneId).toLocalDate();
// // 今天距离执法时间所差天数
// long daysBetween = ChronoUnit.DAYS.between(startDate, LocalDate.now());
// ee.setOutTimeDayNum(daysBetween);
// }
//
// TableDataInfo rspData = getDataTable(list);
// rspData.setCode(0);
// rspData.setRows(list);
// rspData.setTotal(totalNum);
// return rspData;
// }
//
//
// /**
// * 查询执法端-执法登记列表
// */
//// @RequiresPermissions("code:registration:list")
// @GetMapping("/queryListNew")
// @ResponseBody
// public TableDataInfo queryListNew(EnforcementRegistration enforcementRegistration)
// {
// if (Objects.nonNull(enforcementRegistration.getUserId()) && enforcementRegistration.getDateType()==0) {
// UserBean userByUser = userApi.getUserByUserId(enforcementRegistration.getUserId());
// enforcementRegistration.setDeptId(userByUser == null ? null : userByUser.getDeptId());
//
// DeptBean bureauDept = deptApi.iterationDeptParentToBureau(userByUser.getDeptId());
// enforcementRegistration.setBureauDeptId(bureauDept.getDeptId());
// }
// //查询检查总次数
// List<EnforcementRegistration> registrations = enforcementRegistrationService.selectEnforcementRegistrationListNew(enforcementRegistration);
// int count = 0;
// if (registrations.size() >0) {
// count = registrations.stream().map(item -> Integer.valueOf(item.getNum())).reduce(0, Integer::sum);
// }
// //查询列表
// startPage();
// List<EnforcementRegistration> list = enforcementRegistrationService.selectEnforcementRegistrationListNew(enforcementRegistration);
// TableDataInfo dataTable = getDataTable(list);
// dataTable.setMsg(count);
// return dataTable;
// }
//
// @GetMapping("/queryByEpId")
// @ResponseBody
// public ZDResponse queryByEpId(EnforcementRegistration enforcementRegistration)
// {
// if (Objects.nonNull(enforcementRegistration.getUserId()) && enforcementRegistration.getDateType()==0) {
// UserBean userByUser = userApi.getUserByUserId(enforcementRegistration.getUserId());
// enforcementRegistration.setDeptId(userByUser == null ? null : userByUser.getDeptId());
//
// DeptBean bureauDept = deptApi.iterationDeptParentToBureau(userByUser.getDeptId());
// enforcementRegistration.setBureauDeptId(bureauDept.getDeptId());
// }
// List<EnforcementRegistration> list = enforcementRegistrationService.selectEnforcementRegistrationByEpId(enforcementRegistration);
// return ZDResponse.success("获取当前企业本月登记信息",list);
// }
//
// /**
// * 查询企业端-执法登记列表
// */
// @GetMapping("/queryEnterpriseList")
// @ResponseBody
// public TableDataInfo queryEnterpriseList(EnforcementRegistration enforcementRegistration)
// {
// startPage();
// List<EnforcementRegistration> list = enforcementRegistrationService.selectEnterpriseRegistrationList(enforcementRegistration);
// DictDataBean dictParams = new DictDataBean();
// dictParams.setDictType("law_enforce_category");
// List<DictDataBean> dicts = dictDataApi.getDictData(dictParams);
// for (EnforcementRegistration ee : list) {
// // 判断是否投诉
// EnterpriseComplaint params = new EnterpriseComplaint();
// params.setRelId(ee.getId());
// params.setComOrOpi(1);
// List<EnterpriseComplaint> enterpriseComplaints = enterpriseComplaintService.selectEnterpriseComplaintList(params);
// if (null!=enterpriseComplaints && enterpriseComplaints.size()>0) {
// ee.setComOrOpi(1);
// } else {
// ee.setComOrOpi(0);
// }
// // 执法类别
// for (DictDataBean dict : dicts) {
// if (dict.getDictValue().equals(ee.getLawEnforceCategory())) {
// ee.setCheckCategoryText(dict.getDictLabel());
// }
// }
//
// // 执法人员1需要展示用户名+执法码
// UserBean userBean = userApi.getUserByUserId(ee.getLawEnforcerId());
//
// String lawCN = userBean.getLawCertificateNum();
// if(StringUtils.isEmpty(lawCN)){
// lawCN=CommonUtil.encryptPhone(userBean.getPhonenumber());
// }
// ee.setLawEnforcer(userBean.getUserName() +" "+ lawCN);
//
// // 执法人员2需要展示用户名+执法码
// List<String> lawTwoList = new ArrayList<>();
// List<UserBean> userBeans = new ArrayList<>();
// if (StringUtils.isNotEmpty(ee.getLawEnforcerIdTwo())) {
// userBeans = userApi.getUserByUserIds(ee.getLawEnforcerIdTwo());
// }
// for (UserBean ub : userBeans) {
// String temp = ub.getLawCertificateNum();
// if(StringUtils.isEmpty(temp)){
// temp=CommonUtil.encryptPhone(ub.getPhonenumber());
// }
// lawTwoList.add(ub.getUserName() +" "+ temp);
// }
// ee.setLawEnforcer2List(lawTwoList);
//
// // 判断超时多少天
// Instant instant = ee.getEnforcementTime().toInstant();
// ZoneId zoneId = ZoneId.systemDefault();
// LocalDate startDate = instant.atZone(zoneId).toLocalDate();
// // 今天距离执法时间所差天数
// long daysBetween = ChronoUnit.DAYS.between(startDate, LocalDate.now());
// ee.setOutTimeDayNum(daysBetween);
// }
// return getDataTable(list);
// }
//
// /** 剔除执法日期距离今天超过5天的执法数据 */
// @GetMapping("/queryList2")
// @ResponseBody
// public ZDResponse queryList2(EnforcementRegistration enforcementRegistration)
// {
// List<EnforcementRegistration> res = new ArrayList<>();
// List<EnforcementRegistration> list = enforcementRegistrationService.selectEnforcementRegistrationList(enforcementRegistration);
// for (EnforcementRegistration ee : list) {
// // 判断是否投诉
// EnterpriseComplaint params = new EnterpriseComplaint();
// params.setRelId(ee.getId());
// params.setComOrOpi(1);
// List<EnterpriseComplaint> enterpriseComplaints = enterpriseComplaintService.selectEnterpriseComplaintList(params);
// if (null!=enterpriseComplaints && enterpriseComplaints.size()>0) {
// ee.setComOrOpi(1);
// } else {
// ee.setComOrOpi(0);
// }
// // 判断超时多少天
// Instant instant = ee.getEnforcementTime().toInstant();
// ZoneId zoneId = ZoneId.systemDefault();
// LocalDate startDate = instant.atZone(zoneId).toLocalDate();
// // 今天距离执法时间所差天数
// long daysBetween = ChronoUnit.DAYS.between(startDate, LocalDate.now());
// ee.setOutTimeDayNum(daysBetween);
// if (daysBetween <= 4) {
// res.add(ee);
// }
// }
// return ZDResponse.success("查询成功",res);
// }
//
// /** 剔除执法日期距离今天超过5天的执法数据 */
// @GetMapping("/queryListWithFiveDay")
// @ResponseBody
// public TableDataInfo queryListWithFiveDay(EnforcementRegistration enforcementRegistration)
// {
//
// startPage();
// List<EnforcementRegistration> res = new ArrayList<>();
// List<EnforcementRegistration> list = enforcementRegistrationService.selectEnforcementRegistrationList(enforcementRegistration);
// for (EnforcementRegistration ee : list) {
// // 判断是否投诉
// EnterpriseComplaint params = new EnterpriseComplaint();
// params.setRelId(ee.getId());
// params.setComOrOpi(1);
// List<EnterpriseComplaint> enterpriseComplaints = enterpriseComplaintService.selectEnterpriseComplaintList(params);
// if (null!=enterpriseComplaints && enterpriseComplaints.size()>0) {
// ee.setComOrOpi(1);
// } else {
// ee.setComOrOpi(0);
// }
// // 执法人员1需要展示用户名+执法码
// UserBean userBean = userApi.getUserByUserId(ee.getLawEnforcerId());
// String lawCN = StringUtils.isEmpty(userBean.getLawCertificateNum())?"":userBean.getLawCertificateNum();
// ee.setLawEnforcer(userBean.getUserName() +" "+ lawCN);
//
// // 执法人员2需要展示用户名+执法码
// List<String> lawTwoList = new ArrayList<>();
// List<UserBean> userBeans = new ArrayList<>();
// if (StringUtils.isNotEmpty(ee.getLawEnforcerIdTwo())) {
// userBeans = userApi.getUserByUserIds(ee.getLawEnforcerIdTwo());
// }
// for (UserBean ub : userBeans) {
// String lawCertificateNum = StringUtils.isEmpty(ub.getLawCertificateNum())?"":ub.getLawCertificateNum();
// lawTwoList.add(ub.getUserName() +" "+ lawCertificateNum);
// }
// ee.setLawEnforcer2List(lawTwoList);
// // 判断超时多少天
// Instant instant = ee.getEnforcementTime().toInstant();
// ZoneId zoneId = ZoneId.systemDefault();
// LocalDate startDate = instant.atZone(zoneId).toLocalDate();
// // 今天距离执法时间所差天数
// long daysBetween = ChronoUnit.DAYS.between(startDate, LocalDate.now());
// ee.setOutTimeDayNum(daysBetween);
// if (daysBetween <= 4) {
// res.add(ee);
// }
// }
// return getDataTable(res);
// }
//
// /**
// * 新增执法端-执法登记
// */
// @GetMapping("/add")
// public String add()
// {
// return prefix + "/add";
// }
//
// /**
// * 新增保存执法端-执法登记
// */
//// @RequiresPermissions("code:registration:add")
// @PostMapping("/add")
// @ResponseBody
// public ZDResponse addSave(@RequestBody EnforcementRegistration enforcementRegistration)
// {
// String district = "";
// String street = "";
// if (StringUtils.isNotEmpty(enforcementRegistration.getEnterpriseAddress())) {
// district = extract(enforcementRegistration.getEnterpriseAddress(), "([^\\s市]+?区)");
// street = extract(enforcementRegistration.getEnterpriseAddress(), "([^\\s区]+?街道)");
// }
// enforcementRegistration.setDistrict(district);
// enforcementRegistration.setStreet(street);
// return enforcementRegistrationService.insertEnforcementRegistration(enforcementRegistration) > 0
// ? ZDResponse.success("保存成功") : ZDResponse.error("保存失败");
// }
//
// /**
// * 根据企业统一信用号, 搜索出该企业前推一小时内的联合执法.
// * 用于用户自行进行关联
// * @param enterpriseNumber
// * @return
// */
// @GetMapping("/queryUnionByHour/{enterpriseNumber}/{checkCss}/{enforcementTime}/{unionNo}")
// @ResponseBody
// public ZDResponse queryUnionByHour(@PathVariable String enterpriseNumber, @PathVariable String checkCss, @PathVariable String enforcementTime, @PathVariable String unionNo)
// {
// return ZDResponse.success("操作成功", enforcementRegistrationService.queryUnionByHour(enterpriseNumber, checkCss, enforcementTime, unionNo));
// }
//
// /**
// * 修改执法端-执法登记
// */
// @GetMapping("/edit/{id}")
// public String edit(@PathVariable("id") String id, ModelMap mmap)
// {
// EnforcementRegistration enforcementRegistration = enforcementRegistrationService.selectEnforcementRegistrationById(id);
// mmap.put("enforcementRegistration", enforcementRegistration);
// return prefix + "/edit";
// }
//
// /**
// * 修改保存执法端-执法登记
// */
//// @RequiresPermissions("code:registration:edit")
// @PostMapping("/edit")
// @ResponseBody
// public ZDResponse editSave(@RequestBody EnforcementRegistration enforcementRegistration)
// {
// int resNum = 0;
// enforcementRegistration.setIsSubmit(1);
// String district = "";
// String street = "";
// if (StringUtils.isNotEmpty(enforcementRegistration.getEnterpriseAddress())) {
// district = extract(enforcementRegistration.getEnterpriseAddress(), "([^\\s市]+?区)");
// street = extract(enforcementRegistration.getEnterpriseAddress(), "([^\\s区]+?街道)");
// }
// enforcementRegistration.setDistrict(district);
// enforcementRegistration.setStreet(street);
// if (StringUtils.isNotEmpty(enforcementRegistration.getId())) {
// resNum = enforcementRegistrationService.updateEnforcementRegistration(enforcementRegistration);
// } else {
// resNum = enforcementRegistrationService.insertEnforcementRegistration(enforcementRegistration);
// if (resNum > 0 && StringUtils.isNotEmpty(enforcementRegistration.getLawId())) {
// enforcementRegistration.setId(null);
// }
// }
// if (StringUtils.isNotEmpty(enforcementRegistration.getLawId())) {
// EnterpriseLawEnforcement law = new EnterpriseLawEnforcement();
// law.setId(enforcementRegistration.getLawId());
// law.setIsReg(1);
// resNum = enterpriseLawEnforcementService.updateEnterpriseLawEnforcement(law);
// }
// return resNum > 0 ? ZDResponse.success("修改成功") : ZDResponse.error("修改失败");
// }
//
// @PostMapping("/edit2")
// @ResponseBody
// public ZDResponse editSave2(@RequestBody EnforcementRegistration enforcementRegistration)
// {
// enforcementRegistration.setIsSubmit(0);
// String district = extract(enforcementRegistration.getEnterpriseAddress(), "([^\\s市]+?区)");
// String street = extract(enforcementRegistration.getEnterpriseAddress(), "([^\\s区]+?街道)");
// enforcementRegistration.setDistrict(district);
// enforcementRegistration.setStreet(street);
// int resNum = enforcementRegistrationService.updateEnforcementRegistration(enforcementRegistration);
// if (StringUtils.isNotEmpty(enforcementRegistration.getLawId())) {
// EnterpriseLawEnforcement law = new EnterpriseLawEnforcement();
// law.setId(enforcementRegistration.getLawId());
// law.setIsReg(1);
// resNum = enterpriseLawEnforcementService.updateEnterpriseLawEnforcement(law);
// }
// return resNum > 0 ? ZDResponse.success("修改成功") : ZDResponse.error("修改失败");
// }
//
//
// /**
// * 修改执法端-执法登记
// */
// @GetMapping("/detail/{id}")
// public String detail(@PathVariable("id") String id, ModelMap mmap)
// {
// EnforcementRegistration enforcementRegistration = enforcementRegistrationService.selectEnforcementRegistrationById(id);
// mmap.put("enforcementRegistration", enforcementRegistration);
// return prefix + "/detail";
// }
//
// /**
// * 修改保存执法端-执法登记提交
// */
// @RequiresPermissions("code:registration:submit")
// @PostMapping("/submit")
// @ResponseBody
// public ZDResponse submit(@RequestBody EnforcementRegistration enforcementRegistration)
// {
// return enforcementRegistrationService.updateEnforcementRegistration(enforcementRegistration) > 0 ?
// ZDResponse.success("提交成功") : ZDResponse.error("提交失败");
// }
//
// /**
// * 删除执法端-执法登记
// */
// @RequiresPermissions("code:registration:remove")
// @PostMapping( "/remove")
// @ResponseBody
// public ZDResponse remove(String ids)
// {
// return enforcementRegistrationService.deleteEnforcementRegistrationByIds(ids) > 0 ?
// ZDResponse.success("删除成功") : ZDResponse.error("删除失败");
// }
//
// /**
// * 获取预警信息
// */
//// @RequiresPermissions("code:registration:list")
// @GetMapping("/queryEarlyWarning")
// @ResponseBody
// public ZDResponse queryEarlyWarning(EnforcementRegistration enforcementRegistration)
// {
// List<EnforceRegCount> list = enforcementRegistrationService.queryEarlyWarning(enforcementRegistration.getSearchValue());
// return ZDResponse.success("查询成功",list);
// }
//
// /**
// * 执法登记详情
// */
// @GetMapping("/queryById/{id}")
// @ResponseBody
// public ZDResponse queryById(@PathVariable("id") String id)
// {
// EnforcementRegistration enforcementRegistration = enforcementRegistrationService.selectEnforcementRegistrationById(id);
// if (null != enforcementRegistration) {
//// LinkageDict ld1 = iLinkageDictService.selectLinkageDictById(enforcementRegistration.getLawEnforcementItem());
//// Zqyjjdm137344 zq = new Zqyjjdm137344();
//// try {
//// zq = iZqyjjdm137344Service.getZqyjjdmById(enforcementRegistration.getLawEnforcementBasis());
//// } catch (Exception e) {
//// e.printStackTrace();
//// }
//// enforcementRegistration.setLawEnforcementItemText(null==ld1?"":ld1.getTitle());
//// enforcementRegistration.setLawEnforcementBasisText(null==zq?"":zq.getLawName());
//
// // 执法人员1需要展示用户名+执法码
// UserBean userBean = userApi.getUserByUserId(enforcementRegistration.getLawEnforcerId());
// String lawCN = userBean.getUserName() +" "+userBean.getLawCertificateNum();
// if(StringUtils.isEmpty(userBean.getLawCertificateNum())){
// lawCN= userBean.getUserName() +" "+CommonUtil.encryptPhone(userBean.getPhonenumber());
// }
// enforcementRegistration.setLawEnforcer(lawCN);
//
// // 执法人员2需要展示用户名+执法码
// List<UserBean> userBeans = new ArrayList<>();
// if (StringUtils.isNotEmpty(enforcementRegistration.getLawEnforcerIdTwo())) {
// userBeans = userApi.getUserByUserIds(enforcementRegistration.getLawEnforcerIdTwo());
// }
// String tmpUserShow = "";
// for (UserBean ub : userBeans) {
// String temp = ub.getLawCertificateNum();
// if(StringUtils.isEmpty(temp)){
// temp=CommonUtil.encryptPhone(ub.getPhonenumber());
// }
//
// tmpUserShow += ub.getUserName() +" "+ temp + ",";
// }
// if (tmpUserShow.length() > 0) {
// tmpUserShow = tmpUserShow.substring(0, tmpUserShow.length()-1);
// }
// enforcementRegistration.setLawEnforcer2Show(tmpUserShow);
//
// // 字典回显
// DictDataBean dictParams = new DictDataBean();
// // 执法领域
// if (StringUtils.isNotEmpty(enforcementRegistration.getLawField())) {
// dictParams.setDictType("law_field");
// List<DictDataBean> dicts = dictDataApi.getDictData(dictParams);
// for (DictDataBean d : dicts) {
// if (d.getDictValue().equals(enforcementRegistration.getLawField())) {
// enforcementRegistration.setLawFieldText(d.getDictLabel());
// break;
// }
// }
// }
// // 执法类别
// if (StringUtils.isNotEmpty(enforcementRegistration.getCheckCategory())) {
// dictParams.setDictType("check_category");
// List<DictDataBean> dicts = dictDataApi.getDictData(dictParams);
// for (DictDataBean d : dicts) {
// if (d.getDictValue().equals(enforcementRegistration.getCheckCategory())) {
// enforcementRegistration.setCheckCategoryText(d.getDictLabel());
// break;
// }
// }
// }
// // 执法类别
// if (StringUtils.isNotEmpty(enforcementRegistration.getLawEnforceCategory())) {
// dictParams.setDictType("law_enforce_category");
// List<DictDataBean> dicts = dictDataApi.getDictData(dictParams);
// for (DictDataBean d : dicts) {
// if (d.getDictValue().equals(enforcementRegistration.getLawEnforceCategory())) {
// enforcementRegistration.setLawEnforceCategoryText(d.getDictLabel());
// break;
// }
// }
// }
// }
// return ZDResponse.success("查询成功",enforcementRegistration);
// }
//
// /**
// * 执法登记详情 - 联合执法版本
// */
// @GetMapping("/queryUniteById/{id}")
// @ResponseBody
// public ZDResponse queryUniteById(@PathVariable("id") String id)
// {
// List<EnforcementRegistration> regResults = new ArrayList<>();
// List<EnterpriseLawEnforcement> lawResults = new ArrayList<>();
// // 先获取登记数据 - 获取批次id
// EnforcementRegistration enforcementRegistration = enforcementRegistrationService.selectEnforcementRegistrationById(id);
// // 通过联合执法的批次id获取整个批次的联合执法 (查询详情这里不需要获取联合执法信息, 暂时先禁了, 省点性能)
// if (false && StringUtils.isNotEmpty(enforcementRegistration.getUnionNo()) && 1 == enforcementRegistration.getHasUnion()) {
// // 已登记联合检查
// EnforcementRegistration regRarams = new EnforcementRegistration();
//// regRarams.setUniteCheck(enforcementRegistration.getUniteCheck());
// regRarams.setUnionNo((enforcementRegistration.getUnionNo()));
// regResults = enforcementRegistrationService.selectEnforcementRegistrationList(regRarams);
// // 预约未登记的 (预约没要联合检查了)
// EnterpriseLawEnforcement lawRarams = new EnterpriseLawEnforcement();
// lawRarams.setUniteCheck(enforcementRegistration.getUniteCheck());
// lawRarams.setIsReg(0);
// lawResults = enterpriseLawEnforcementService.selectEnterpriseLawEnforcementList2(lawRarams);
// } else {
// regResults.add(enforcementRegistration);
// }
//
// //查询行政检查评价
// EnterpriseEvaluate enterpriseEvaluate = new EnterpriseEvaluate();
//// if (StringUtils.isNotEmpty(regResults.get(0).getUniteCheck())) {
//// enterpriseEvaluate = enterpriseEvaluateService.selectEnterpriseEvaluateByUniteCheck(regResults.get(0).getUniteCheck());
// if (StringUtils.isNotEmpty(regResults.get(0).getUnionNo())) {
// enterpriseEvaluate = enterpriseEvaluateService.selectEnterpriseEvaluateByUniteCheck(regResults.get(0).getUnionNo());
// } else {
// enterpriseEvaluate = enterpriseEvaluateService.selectEnterpriseEvaluateByRelId(regResults.get(0).getId());
// }
//
// for (EnforcementRegistration reg : regResults) {
// // 执法人员1需要展示用户名+执法码 没有执法码展示加密手机号
// UserBean userBean = userApi.getUserByUserId(reg.getLawEnforcerId());
// String lawCN = userBean.getUserName() +" "+userBean.getLawCertificateNum();
// if(StringUtils.isEmpty(userBean.getLawCertificateNum())){
// lawCN=userBean.getUserName() +" "+ CommonUtil.encryptPhone(userBean.getPhonenumber());
// }
// reg.setLawEnforcer(lawCN);
//
// // 执法人员2需要展示用户名+执法码 没有执法码展示加密手机号
// List<UserBean> userBeans = new ArrayList<>();
// if (StringUtils.isNotEmpty(reg.getLawEnforcerIdTwo())) {
// userBeans = userApi.getUserByUserIds(reg.getLawEnforcerIdTwo());
// }
// String tmpUserShow = "";
// for (UserBean ub : userBeans) {
// String temp = ub.getLawCertificateNum();
// if(StringUtils.isEmpty(temp)){
// temp= CommonUtil.encryptPhone(ub.getPhonenumber());
// }
// tmpUserShow += ub.getUserName() +" "+ temp + ",";
// }
// if (tmpUserShow.length() > 0) {
// tmpUserShow = tmpUserShow.substring(0, tmpUserShow.length()-1);
// }
// reg.setLawEnforcer2Show(tmpUserShow);
//
// // 字典回显
// DictDataBean dictParams = new DictDataBean();
// // 执法领域
// if (StringUtils.isNotEmpty(reg.getLawField())) {
// dictParams.setDictType("law_field");
// List<DictDataBean> dicts = dictDataApi.getDictData(dictParams);
// for (DictDataBean d : dicts) {
// if (d.getDictValue().equals(reg.getLawField())) {
// reg.setLawFieldText(d.getDictLabel());
// break;
// }
// }
// }
// // 任务来源
// if (StringUtils.isNotEmpty(reg.getCheckCategory())) {
// dictParams.setDictType("check_category");
// List<DictDataBean> dicts = dictDataApi.getDictData(dictParams);
// for (DictDataBean d : dicts) {
// if (d.getDictValue().equals(reg.getCheckCategory())) {
// reg.setCheckCategoryText(d.getDictLabel());
// break;
// }
// }
// }
//
// // 执法类别
// if (StringUtils.isNotEmpty(reg.getLawEnforceCategory())) {
// dictParams.setDictType("law_enforce_category");
// List<DictDataBean> dicts = dictDataApi.getDictData(dictParams);
// for (DictDataBean d : dicts) {
// if (d.getDictValue().equals(reg.getLawEnforceCategory())) {
// reg.setLawEnforceCategoryText(d.getDictLabel());
// break;
// }
// }
// }
// // 评价
//
// //查询行政检查评价
//// EnterpriseEvaluate enterpriseEvaluate = new EnterpriseEvaluate();
//// if (StringUtils.isNotEmpty(enforcementRegistration.getUniteCheck())) {
//// enterpriseEvaluate = enterpriseEvaluateService.selectEnterpriseEvaluateByUniteCheck(enforcementRegistration.getUniteCheck());
//// } else {
//// enterpriseEvaluate = enterpriseEvaluateService.selectEnterpriseEvaluateByRelId(enforcementRegistration.getId());
//// }
// reg.setEnterpriseEvaluate(enterpriseEvaluate);
// }
//
// for (EnterpriseLawEnforcement law : lawResults) {
// // 执法人员1需要展示用户名+执法码
// List<UserBean> userBeans1 = new ArrayList<>();
// if (StringUtils.isNotEmpty(law.getLawEnforcerId())) {
// userBeans1 = userApi.getUserByUserIds(law.getLawEnforcerId());
// }
// String tmpUserShow1 = "";
// for (UserBean ub : userBeans1) {
// String lawCertificateNum = StringUtils.isEmpty(ub.getLawCertificateNum()) ? "" : ub.getLawCertificateNum();
// tmpUserShow1 += ub.getUserName() + " " + lawCertificateNum + ",";
// }
// if (tmpUserShow1.length() > 0) {
// tmpUserShow1 = tmpUserShow1.substring(0, tmpUserShow1.length() - 1);
// }
// law.setLawEnforcer(tmpUserShow1);
//
// // 执法人员2需要展示用户名+执法码
// List<UserBean> userBeans2 = new ArrayList<>();
// if (StringUtils.isNotEmpty(law.getLawEnforcerTwoId())) {
// userBeans2 = userApi.getUserByUserIds(law.getLawEnforcerTwoId());
// }
// String tmpUserShow2 = "";
// for (UserBean ub : userBeans2) {
// String lawCertificateNum = StringUtils.isEmpty(ub.getLawCertificateNum()) ? "" : ub.getLawCertificateNum();
// tmpUserShow2 += ub.getUserName() + " " + lawCertificateNum + ",";
// }
// if (tmpUserShow2.length() > 0) {
// tmpUserShow2 = tmpUserShow2.substring(0, tmpUserShow2.length() - 1);
// }
// law.setLawEnforcer2Show(tmpUserShow2);
// }
// Map<String, List> result = new HashMap<>();
// result.put("regResults", regResults);
// result.put("lawResults", lawResults);
// return ZDResponse.success("查询成功",result);
// }
//
// /**
// * 查询附件信息
// *
// * @param key
// * @return
// */
// @GetMapping("/queryFiles/{key}")
// @ResponseBody
// public ZDResponse queryFiles(@PathVariable String key) {
// HashMap<String, Object> map = new HashMap<>();
// map.put("filePreview", enforcementRegistrationService.queryFiles(key));
// return ZDResponse.success("获取成功", map);
// }
//
// /**
// * 查询附件信息
// *
// * @param key
// * @return
// */
// @PostMapping("/queryFilesPost")
// @ResponseBody
// public ZDResponse queryFilesPost(String key) {
// HashMap<String, Object> map = new HashMap<>();
// map.put("filePreview", enforcementRegistrationService.queryFiles(key));
// return ZDResponse.success("获取成功", map);
// }
//
// /**
// * 查看预约记录详情
// */
//// @GetMapping( "/getByUserIdAndZero/{userId}")
//// @ResponseBody
//// public ZDResponse getByUserIdAndZero(@PathVariable Long userId)
//// {
//// EnforcementRegistration registration = enforcementRegistrationService.getByUserIdAndZero(userId);
//// Map<String, Object> params = new HashMap<>();
//// LinkageDict tmp = iLinkageDictService.selectLinkageDictById(registration.getLawEnforcementItem());
//// params.put("lawEnforcementItemText", null!=tmp?tmp.getTitle():"");
//// tmp = iLinkageDictService.selectLinkageDictById(registration.getLawEnforcementBasis());
//// params.put("lawEnforcementBasisText", null!=tmp?tmp.getTitle():"");
//// registration.setParams(params);
//// return ZDResponse.success("查询成功", registration);
//// }
// @GetMapping( "/getByUserIdAndEnterpriseNumber/{modth}/{userId}/{enterpriseNumber}")
// @ResponseBody
// public ZDResponse getByUserIdAndEnterpriseNumber(@PathVariable String modth, @PathVariable Long userId, @PathVariable String enterpriseNumber)
// {
// // 拿到的企业编码是加密盐的, 和登记表对不上
// EnterpriseInformation enterpriseInformation = null;
// if ("add".equals(modth)) {
// enterpriseInformation = iEnterpriseInformationService.selectEnterpriseInformationBySalt(enterpriseNumber);
// } else {
// enterpriseInformation = iEnterpriseInformationService.selectEnterpriseInformationByNum(enterpriseNumber);
// }
// // 前端似乎没保存部门id, 所以弄个userId上来 通过userId获取其部门id
// UserBean userBean = userApi.getUserByUserId(userId);
// EnforcementRegistration registration = enforcementRegistrationService.getByDeptIdAndEnterpriseNumber(userBean.getDeptId(), enterpriseInformation.getEnterpriseNumber());
// // 执法人员需要展示用户名+执法码
// List<UserBean> userBeans = new ArrayList<>();
// if (StringUtils.isNotEmpty(registration.getLawEnforcerIdTwo())) {
// userBeans = userApi.getUserByUserIds(registration.getLawEnforcerIdTwo());
// }
// String tmpUserShow = "";
// for (UserBean ub : userBeans) {
// String lawCertificateNum = StringUtils.isEmpty(ub.getLawCertificateNum())?"":ub.getLawCertificateNum();
// tmpUserShow += ub.getUserName() +" "+ lawCertificateNum + ",";
// }
// if (tmpUserShow.length() > 0) {
// tmpUserShow = tmpUserShow.substring(0, tmpUserShow.length()-1);
// }
// registration.setLawEnforcer2Show(tmpUserShow);
//
// // 字典回显
// DictDataBean dictParams = new DictDataBean();
// // 执法领域
// if (StringUtils.isNotEmpty(registration.getLawField())) {
// dictParams.setDictType("law_field");
// List<DictDataBean> dicts = dictDataApi.getDictData(dictParams);
// for (DictDataBean d : dicts) {
// if (d.getDictValue().equals(registration.getLawField())) {
// registration.setLawFieldText(d.getDictLabel());
// break;
// }
// }
// }
// // 执法类别
// if (StringUtils.isNotEmpty(registration.getCheckCategory())) {
// dictParams.setDictType("check_category");
// List<DictDataBean> dicts = dictDataApi.getDictData(dictParams);
// for (DictDataBean d : dicts) {
// if (d.getDictValue().equals(registration.getCheckCategory())) {
// registration.setCheckCategoryText(d.getDictLabel());
// break;
// }
// }
// }
//
// if (null!=registration && StringUtils.isNotEmpty(registration.getId())) {
// Map<String, Object> params = new HashMap<>();
// LinkageDict tmp = iLinkageDictService.selectLinkageDictById(registration.getLawEnforcementItem());
// params.put("lawEnforcementItemText", null != tmp ? tmp.getTitle() : "");
// registration.setParams(params);
// return ZDResponse.success("查询成功", registration);
// }
// return ZDResponse.error("查询失败");
// }
//
// /**
// * 查看预约记录详情
// */
// @GetMapping( "/getByIdToDataFillIn/{id}")
// @ResponseBody
// public ZDResponse getByIdToDataFillIn(@PathVariable String id)
// {
// EnforcementRegistration registration = enforcementRegistrationService.getEnforcementRegistrationById(id);
//
// //TODO 执法事项修改为手动输入
//// Map<String, Object> params = new HashMap<>();
//// LinkageDict tmp = iLinkageDictService.selectLinkageDictById(registration.getLawEnforcementItem());
//// params.put("lawEnforcementItemText", tmp.getTitle());
//// tmp = iLinkageDictService.selectLinkageDictById(registration.getLawEnforcementBasis());
//// params.put("lawEnforcementBasisText", tmp.getTitle());
//// registration.setParams(params);
// return ZDResponse.success("查询成功", registration);
// }
//
// /**
// * 获取全部执法部门
// * @param bean
// * @return
// */
// @PostMapping("/getAllEnforceDept")
// @ResponseBody
// public TableDataInfo getAllEnforceDept(@RequestBody DeptBean bean){
// int count=deptApi.getAllEnforceDeptCount(bean);
// List<DeptBean> list= deptApi.getAllEnforceDept(bean);
// TableDataInfo rspData = getDataTable(list);
// rspData.setCode(0);
// rspData.setRows(list);
// rspData.setTotal(count);
// return rspData;
// }
//
// private static String extract(String text, String regex) {
// java.util.regex.Pattern pattern = java.util.regex.Pattern.compile(regex);
// java.util.regex.Matcher matcher = pattern.matcher(text);
// if (matcher.find()) {
// return matcher.group(1);
// }
// return "";
// }
//}
//
//

5
zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EnforcementEducationServicesVo.java

@ -106,5 +106,10 @@ public class EnforcementEducationServicesVo implements Serializable {
@ExcelProperty(value = "备注")
private String remark;
/**
* 是否已读 0-未读 1-已读
*/
@ExcelProperty(value = "是否已读 0-未读 1-已读")
private Integer isRead;
}

12
zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EnforcementEducationServicesMapper.java

@ -5,6 +5,8 @@ import com.zdxt.enforcementcode.domain.vo.EnforcementEducationServicesVo;
import org.apache.ibatis.annotations.Param;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import java.util.List;
/**
* 执法信息发布主Mapper接口
*
@ -20,5 +22,13 @@ public interface EnforcementEducationServicesMapper extends BaseMapperPlus<Enfor
* @return 未读普法消息数量
*/
Long countUnreadEducationServices(@Param("companyId") String companyId);
}
/**
* 查询已读的消息ID列表
*
* @param messageIds 消息ID列表
* @param companyId 企业ID
* @return 已读的消息ID列表
*/
List<String> selectReadMessageIds(@Param("messageIds") List<String> messageIds, @Param("companyId") String companyId);
}

6
zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/common/impl/FileUploadApiImpl.java

@ -1,9 +1,11 @@
package com.zdxt.enforcementcode.service.common.impl;
import com.zdxt.enforcementcode.common.config.RuoYiConfig;
import com.zdxt.enforcementcode.common.util.file.FileUploadUtils;
import com.zdxt.enforcementcode.service.common.FileUploadApi;
import org.dromara.common.core.exception.base.BaseException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
@ -18,9 +20,11 @@ import java.io.IOException;
@Service
public class FileUploadApiImpl implements FileUploadApi {
@Autowired
RuoYiConfig ruoYiConfig;
@Override
public String upload(MultipartFile file) {
String filePath = FileUploadUtils.getDefaultBaseDir();
String filePath = RuoYiConfig.getUploadPath();
try {
return FileUploadUtils.upload(filePath, file);
} catch (IOException e) {

55
zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementEducationServicesServiceImpl.java

@ -22,6 +22,7 @@ import com.zdxt.enforcementcode.domain.bo.SysMessageViewLogBo;
import java.util.List;
import java.util.Map;
import java.util.Collection;
import java.util.stream.Collectors;
/**
* 执法信息发布主Service业务层处理
@ -97,6 +98,12 @@ public class EnforcementEducationServicesServiceImpl implements IEnforcementEduc
public TableDataInfo<EnforcementEducationServicesVo> queryPageList(EnforcementEducationServicesBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<EnforcementEducationServices> lqw = buildQueryWrapper(bo);
Page<EnforcementEducationServicesVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
// 为每条记录设置是否已读状态
if (result.getRecords() != null && !result.getRecords().isEmpty()) {
setReadStatus(result.getRecords());
}
return TableDataInfo.build(result);
}
@ -112,6 +119,44 @@ public class EnforcementEducationServicesServiceImpl implements IEnforcementEduc
return baseMapper.selectVoList(lqw);
}
/**
* 为消息列表设置是否已读状态
*
* @param records 消息记录列表
*/
private void setReadStatus(List<EnforcementEducationServicesVo> records) {
// 获取当前登录用户的企业ID
String companyId = LoginHelper.getDeptId();
if (StringUtils.isBlank(companyId)) {
log.warn("当前用户未关联企业,无法设置已读状态");
// 将所有记录设置为未读
records.forEach(record -> record.setIsRead(0));
return;
}
// 获取所有消息ID
List<String> messageIds = records.stream()
.map(EnforcementEducationServicesVo::getId)
.collect(Collectors.toList());
if (messageIds.isEmpty()) {
return;
}
// 查询已读的消息ID列表
List<String> readMessageIds = baseMapper.selectReadMessageIds(messageIds, companyId);
// 设置每条记录的已读状态
records.forEach(record -> {
if (readMessageIds.contains(record.getId())) {
record.setIsRead(1); // 已读
} else {
record.setIsRead(0); // 未读
}
});
}
private LambdaQueryWrapper<EnforcementEducationServices> buildQueryWrapper(EnforcementEducationServicesBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<EnforcementEducationServices> lqw = Wrappers.lambdaQuery();
@ -191,19 +236,19 @@ public class EnforcementEducationServicesServiceImpl implements IEnforcementEduc
public Long countUnreadEducationServices() {
// 获取当前登录用户的企业ID
String companyId = LoginHelper.getDeptId();
if (StringUtils.isBlank(companyId)) {
log.warn("当前用户未关联企业,无法统计未读普法消息");
return 0L;
}
log.debug("统计企业未读普法消息: companyId={}", companyId);
// 查询未读普法消息数量
Long unreadCount = baseMapper.countUnreadEducationServices(companyId);
log.info("企业 {} 的未读普法消息数量: {}", companyId, unreadCount);
return unreadCount != null ? unreadCount : 0L;
}
}

13
zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementEducationServicesMapper.xml

@ -20,4 +20,17 @@
)
</select>
<!-- 查询已读的消息ID列表 -->
<select id="selectReadMessageIds" resultType="java.lang.String">
SELECT DISTINCT smvl.source_id
FROM sys_message_view_log smvl
WHERE smvl.source_id IN
<foreach collection="messageIds" item="messageId" open="(" separator="," close=")">
#{messageId}
</foreach>
AND smvl.company_id = #{companyId}
AND smvl.source_type = 1
AND smvl.is_delete = 0
</select>
</mapper>

4
zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev.yml

@ -1,7 +1,7 @@
zdxt:
file:
upload-path: /usr/local/uploadPath
# upload-path: /Users/vincent/uploadPath
# upload-path: /usr/local/uploadPath
upload-path: /Users/vincent/uploadPath
url-prefix: /profile
qr_code_url: /usr/local/uploads/zfjd_logo.png
demo_enabled: false

Loading…
Cancel
Save