From 1a316551c8e46b793904090cfa84781bf77fef2a Mon Sep 17 00:00:00 2001
From: zhangf <1603559716@qq.com>
Date: 星期三, 11 九月 2024 15:51:49 +0800
Subject: [PATCH] 增加科目类别
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/InstitutionalManagerServiceImpl.java | 40 +++++++++++++++++++++++++++++++++++++---
1 files changed, 37 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/InstitutionalManagerServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/InstitutionalManagerServiceImpl.java
index 5bdccdc..86e1884 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/InstitutionalManagerServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/InstitutionalManagerServiceImpl.java
@@ -1,15 +1,26 @@
package com.ruoyi.system.service.impl;
+import com.alibaba.fastjson2.JSONObject;
+import com.alibaba.fastjson2.TypeReference;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.constant.ResultConstants;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.model.ResultVO;
import com.ruoyi.common.enums.InstitutionStatus;
+import com.ruoyi.common.exception.BusinessException;
+import com.ruoyi.common.signature.AESUtils;
+import com.ruoyi.common.utils.HttpClientUtil;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.domain.InstitutionalManager;
+import com.ruoyi.system.domain.ThAccessAddress;
+import com.ruoyi.system.domain.enums.AccessAddressType;
import com.ruoyi.system.domain.query.InstitutionManagerQuery;
import com.ruoyi.system.domain.req.InstitutionModStatusReqDTO;
+import com.ruoyi.system.domain.vo.InstitutionVo;
+import com.ruoyi.system.mapper.ThAccessAddressMapper;
import com.ruoyi.system.service.InstitutionalManagerService;
import com.ruoyi.system.domain.req.InstitutionalManagerAddReqDTO;
import com.ruoyi.system.domain.req.InstitutionalManagerModReqDTO;
@@ -17,16 +28,19 @@
import com.ruoyi.common.enums.coalmineEnums.DeleteStatusEnum;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.RandomUtil;
+import com.ruoyi.system.service.ThAccessAddressService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.List;
+import java.util.*;
@Service("InstitutionalManagerService")
public class InstitutionalManagerServiceImpl extends ServiceImpl<InstitutionalManagerMapper, InstitutionalManager> implements InstitutionalManagerService {
@Autowired
private InstitutionalManagerMapper institutionalManagerMapper;
+ @Autowired
+ private ThAccessAddressService thAccessAddressService;
@Override
public int add(InstitutionalManagerAddReqDTO reqDTO) {
@@ -88,10 +102,25 @@
@Override
public int modStatus(InstitutionModStatusReqDTO reqDTO) {
- InstitutionalManager institutionalManager = new InstitutionalManager();
+ //获取该机构信息
+ InstitutionalManager institutionalManager = this.getById(reqDTO.getId());
+ //获取该机构访问路径
+ ThAccessAddress accessAddress = thAccessAddressService.getByInstitutionIdAndType(reqDTO.getId(), AccessAddressType.NOTICE.getType());
+ //推送到机构
+ InstitutionVo institutionVo = new InstitutionVo();
+ institutionVo.setInstitutionName(institutionalManager.getInstitutionalName());
+ institutionVo.setStatus(reqDTO.getStatus());
+ institutionVo.setReason(reqDTO.getReason());
+ /* String json = HttpClientUtil.doPost(accessAddress.getUrl(), JSONObject.toJSONString(institutionVo));
+ ResultVO<String> returnVo = JSONObject.parseObject(json, new TypeReference<ResultVO<String>>() {});
+ if(returnVo.getCode() == null || returnVo.getCode() != 200){
+ throw new ServiceException("推送平台信息异常");
+ }*/
institutionalManager.setId(reqDTO.getId());
institutionalManager.setStatus(reqDTO.getStatus());
- return institutionalManagerMapper.updateById(institutionalManager);
+ institutionalManager.setReason(reqDTO.getReason());
+ int i = institutionalManagerMapper.updateById(institutionalManager);
+ return i;
}
@Override
@@ -99,6 +128,11 @@
return institutionalManagerMapper.selectList(new LambdaQueryWrapper<InstitutionalManager>().eq(InstitutionalManager::getDelFlag,DeleteStatusEnum.NO.getStatus()));
}
+ @Override
+ public List<InstitutionalManager> getAllList() {
+ return institutionalManagerMapper.selectList(new LambdaQueryWrapper<InstitutionalManager>().eq(InstitutionalManager::getDelFlag,DeleteStatusEnum.NO.getStatus()));
+ }
+
//生成编码
private Long generateCode() {
--
Gitblit v1.9.2