Browse Source

预警

master
ljf 4 months ago
parent
commit
784aeb138a
  1. 9
      jwtech-admin/src/main/java/com/kms/config/scheduled/WaterScheduled.java
  2. 7
      jwtech-admin/src/main/java/com/kms/web/controller/system/CmsCallBackController.java
  3. 17
      jwtech-admin/src/main/java/com/kms/web/controller/system/SysLoginController.java
  4. 9
      jwtech-admin/src/main/java/com/kms/web/controller/system/SysUserController.java
  5. 6
      jwtech-admin/src/main/java/com/kms/web/controller/tool/TestController.java
  6. 2
      jwtech-pc/src/main/java/com/kms/web/controller/common/CommonController.java
  7. 2
      jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectInfoService.java
  8. 4
      jwtech-system/src/main/java/com/kms/warn/WarnOperate.java
  9. 7
      jwtech-system/src/main/java/com/kms/warn/WarningJudgment.java
  10. 2
      jwtech-system/src/main/java/com/water/SHACoder.java
  11. 8
      jwtech-system/src/main/java/com/water/WaterPortal.java
  12. 97
      jwtech-system/src/main/java/com/water/WaterRequestUtil.java
  13. 2
      jwtech-system/src/main/java/com/water/WaterResult.java
  14. 2
      jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectFeasibilityMapper.xml

9
jwtech-admin/src/main/java/com/kms/config/scheduled/WaterScheduled.java

@ -15,9 +15,8 @@ import com.jianwei.common.utils.StringUtils;
import com.jianwei.common.utils.password.MD5Util;
import com.jianwei.common.utils.password.PasswordUtil;
import com.jianwei.common.utils.uuid.IdUtils;
import com.kms.common.utils.BaseEntityUtils;
import com.kms.config.WaterRequestUtil;
import com.kms.config.WaterResult;
import com.water.WaterRequestUtil;
import com.water.WaterResult;
import com.kms.config.singleDomain.SingleOrg;
import com.kms.config.singleDomain.SingleRole;
import com.kms.config.singleDomain.SingleUser;
@ -35,10 +34,8 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.annotation.Scheduled;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@Configuration
public class WaterScheduled {
@ -112,6 +109,8 @@ public class WaterScheduled {
String md = MD5Util.MD5Encode(singleUser.toString(), "utf-8");
if(user.getMd5()!=null&&md.equals(user.getMd5())){
continue;
}else {
user.setMd5(md);
}
}
SingleOrg org = singleUser.getOrg();

7
jwtech-admin/src/main/java/com/kms/web/controller/system/CmsCallBackController.java

@ -5,18 +5,15 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.jianwei.common.core.domain.AjaxResult;
import com.jianwei.common.core.domain.entity.SysDept;
import com.jianwei.common.core.domain.entity.SysRole;
import com.jianwei.common.core.domain.entity.SysUser;
import com.jianwei.common.exception.CustomException;
import com.jianwei.common.utils.password.MD5Util;
import com.jianwei.common.utils.password.PasswordUtil;
import com.jianwei.common.utils.uuid.IdUtils;
import com.kms.config.CallBackRequest;
import com.kms.config.CallType;
import com.kms.config.WaterResult;
import com.kms.config.scheduled.WaterScheduled;
import com.water.WaterResult;
import com.kms.config.singleDomain.SingleOrg;
import com.kms.config.singleDomain.SingleRole;
import com.kms.config.singleDomain.SingleUser;
@ -34,9 +31,7 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import java.util.Arrays;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.stream.Collectors;

17
jwtech-admin/src/main/java/com/kms/web/controller/system/SysLoginController.java

@ -3,7 +3,6 @@ package com.kms.web.controller.system;
import cn.dev33.satoken.stp.StpUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.http.HttpResponse;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@ -22,29 +21,21 @@ import com.jianwei.common.exception.CustomException;
import com.jianwei.common.mybaitsplus.BeanToWrapper;
import com.jianwei.common.utils.StringUtils;
import com.jianwei.common.utils.password.PasswordUtil;
import com.jianwei.ir.Node;
import com.jianwei.ir.boot.KeywordType;
import com.jianwei.thrift.ir.OrderItem;
import com.kms.common.utils.UserUtils;
import com.kms.config.WaterRequestUtil;
import com.kms.config.WaterResult;
import com.water.WaterRequestUtil;
import com.water.WaterResult;
import com.kms.config.singleDomain.SingleMenu;
import com.kms.config.singleDomain.SingleRole;
import com.kms.framework.manager.AsyncManager;
import com.kms.framework.manager.factory.AsyncFactory;
import com.kms.framework.web.service.SysPermissionService;
import com.kms.system.domain.CmsTag;
import com.kms.system.domain.SysRoleMenu;
import com.kms.system.domain.vo.RouterVo;
import com.kms.system.service.SysMenuService;
import com.kms.system.service.SysRoleMenuService;
import com.kms.system.service.SysRoleService;
import com.kms.system.service.SysUserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.SneakyThrows;
import lombok.extern.log4j.Log4j2;
import org.apache.commons.lang.SerializationUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.transaction.annotation.Transactional;
@ -52,7 +43,6 @@ import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.view.RedirectView;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
@ -87,7 +77,6 @@ public class SysLoginController extends BaseController {
@PostMapping("/login")
@ApiOperation("登录接口")
public AjaxResult login(@RequestBody LoginBody loginBody) {
if(StringUtils.isEmpty(loginBody.getUsername())){
log.info("登录用户:{} 不存在.", loginBody.getUsername());
AsyncManager.me().execute(AsyncFactory.recordLogininfor(loginBody.getUsername(), Constants.LOGIN_FAIL, "用户不存在"));
@ -135,6 +124,7 @@ public class SysLoginController extends BaseController {
return ajax;
}
/**
* 获取用户信息
*
@ -215,6 +205,7 @@ public class SysLoginController extends BaseController {
AsyncManager.me().execute(AsyncFactory.recordLogininfor(sysUser.getUserName(), Constants.LOGIN_FAIL, "账户已停用"));
throw new BaseException("对不起,您的账号:" + sysUser.getUserName() + " 已停用");
}
AsyncManager.me().execute(AsyncFactory.recordLogininfor(sysUser.getUserName(), Constants.LOGIN_SUCCESS, "登录成功"));
StpUtil.login(sysUser.getId());
StpUtil.getSession().set("jianwei-user",sysUser);

9
jwtech-admin/src/main/java/com/kms/web/controller/system/SysUserController.java

@ -2,8 +2,6 @@ package com.kms.web.controller.system;
import cn.dev33.satoken.annotation.SaCheckLogin;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.jianwei.common.annotation.Log;
import com.jianwei.common.constant.UserConstants;
@ -14,19 +12,16 @@ import com.jianwei.common.core.domain.entity.SysDept;
import com.jianwei.common.core.domain.entity.SysRole;
import com.jianwei.common.core.domain.entity.SysUser;
import com.jianwei.common.enums.BusinessType;
import com.jianwei.common.mybaitsplus.BeanToWrapper;
import com.jianwei.common.page.TableDataInfo;
import com.jianwei.common.utils.StringUtils;
import com.jianwei.common.utils.password.PasswordUtil;
import com.jianwei.common.utils.poi.ExcelUtil;
import com.kms.common.utils.UserUtils;
import com.kms.config.WaterRequestUtil;
import com.kms.config.WaterResult;
import com.water.WaterRequestUtil;
import com.water.WaterResult;
import com.kms.system.service.SysDeptService;
import com.kms.system.service.SysPostService;
import com.kms.system.service.SysRoleService;
import com.kms.system.service.SysUserService;
import org.springframework.aop.aspectj.AspectJExpressionPointcut;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

6
jwtech-admin/src/main/java/com/kms/web/controller/tool/TestController.java

@ -8,8 +8,8 @@ import java.util.Map;
import cn.hutool.core.collection.CollectionUtil;
import com.kms.build.domain.BsSgcjsjdBuiProInfo;
import com.kms.build.service.BsSgcjsjdBuiProInfoService;
import com.kms.config.WaterRequestUtil;
import com.kms.config.WaterResult;
import com.water.WaterRequestUtil;
import com.water.WaterResult;
import com.kms.config.singleDomain.SingleMenu;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@ -47,7 +47,7 @@ public class TestController extends BaseController
@PostMapping("test")
public WaterResult test(@RequestBody BsSgcjsjdBuiProInfo bsSgcjsjdBuiProInfo){
WaterResult waterResult =waterRequestUtil.usersPage();
WaterResult waterResult = waterRequestUtil.usersPage();
// List<SingleMenu> singleMenus = JSONObject.parseArray(waterResult.getData(), SingleMenu.class);
// List<SingleMenu> singleAllMenus = new ArrayList<>();
// setChildren(singleMenus,singleAllMenus);

2
jwtech-pc/src/main/java/com/kms/web/controller/common/CommonController.java

@ -182,8 +182,6 @@ public class CommonController
response.setHeader("Content-Disposition",
"attachment;fileName=" + FileUtils.setFileDownloadHeader(request, downloadName));
FileUtils.writeBytes(downloadPath, response.getOutputStream());
}
@PostMapping("/logout")

2
jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectInfoService.java

@ -101,8 +101,6 @@ public class SpecialProjectInfoService extends BaseService<SpecialProjectInfoMap
data.getProNo(),
data.getProjectType(), sysXzqhService.getSubString(data.getAdcd()), (String) params.get("orderBy"));
}
return list1;
}

4
jwtech-system/src/main/java/com/kms/warn/WarnOperate.java

@ -7,6 +7,7 @@ import com.jianwei.common.mybaitsplus.BeanToWrapper;
import com.jwtech.util.StringUtil;
import com.kms.warn.domain.BsSgcJsjdWarnResult;
import com.kms.warn.service.BsSgcJsjdWarnResultService;
import com.water.WaterRequestUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -16,6 +17,9 @@ public class WarnOperate {
@Autowired
BsSgcJsjdWarnResultService bsSgcJsjdWarnResultService;
@Autowired
WaterRequestUtil waterRequestUtil;
/**
* 发起预警
*/

7
jwtech-system/src/main/java/com/kms/warn/WarningJudgment.java

@ -13,6 +13,7 @@ import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.scheduling.annotation.Async;
import java.math.BigDecimal;
import java.sql.Wrapper;
import java.time.Instant;
import java.util.Calendar;
import java.util.Date;
@ -138,12 +139,8 @@ public class WarningJudgment<T> {
long timeInMillis = instance.getTimeInMillis();
WarnRo warnRo = new WarnRo(exceedingContractPeriod,proNo,proCode);
redisTemplate.opsForZSet().add(redisKey,warnRo,timeInMillis);
}
}
}

2
jwtech-admin/src/main/java/com/kms/config/SHACoder.java → jwtech-system/src/main/java/com/water/SHACoder.java

@ -1,4 +1,4 @@
package com.kms.config;
package com.water;
import java.security.MessageDigest;
import java.security.Security;

8
jwtech-admin/src/main/java/com/kms/config/WaterPortal.java → jwtech-system/src/main/java/com/water/WaterPortal.java

@ -1,16 +1,12 @@
package com.kms.config;
package com.water;
import cn.hutool.core.lang.UUID;
import cn.hutool.core.util.IdUtil;
import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpResponse;
import com.alibaba.fastjson.JSONObject;
import com.jianwei.common.utils.http.HttpUtils;
import com.jwtech.util.HttpUtil;
import com.kms.common.http.utils.HttpClientUtils;
import com.kms.config.singleDomain.SingleOrg;
import lombok.Data;
import java.io.IOException;
import java.util.Date;
import java.util.HashMap;
import java.util.List;

97
jwtech-admin/src/main/java/com/kms/config/WaterRequestUtil.java → jwtech-system/src/main/java/com/water/WaterRequestUtil.java

@ -1,20 +1,15 @@
package com.kms.config;
package com.water;
import cn.hutool.core.util.IdUtil;
import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpResponse;
import com.alibaba.fastjson.JSONObject;
import com.jianwei.common.core.domain.AjaxResult;
import com.jianwei.common.exception.CustomException;
import com.kms.config.scheduled.WaterScheduled;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import java.util.Arrays;
import java.util.Date;
import java.util.HashMap;
@ -50,6 +45,10 @@ public class WaterRequestUtil {
//验证用户登录
@Value("${water.userUrl}")
public String userUrl;
@Value("${water.messageUrl}")
public String messageUrl;
@Value("${water.authUserServiceId}")
public String authUserServiceId;
@Value("${water.authUserAppsecret}")
@ -194,6 +193,71 @@ public class WaterRequestUtil {
//
// }
public static void main(String[] args) {
HttpRequest httpRequest = HttpRequest.post("http://210.76.82.26:880/ebus/1606128918164250625/services/am-msgc/msgc/open-api/msg/add");
// String tifTimestamp = String.valueOf(new Date().getTime() / 1000);
// String tspTimestamp = String.valueOf(new Date().getTime() / 1000);
//
// String tifnonce = IdUtil.fastSimpleUUID();
// String tspnonce = IdUtil.fastSimpleUUID();
// String tifSignature = tifTimestamp + "459c2793c1434cf781cc6ed644c29ecd" + tifnonce + tifTimestamp;
// String tspSignature = tspTimestamp + "sgc-jg~sMO8Ha2" + tspnonce + tspTimestamp;
//// System.out.println(signature);
// try {
// tifSignature = SHACoder.encodeSHA256Hex(tifSignature).toUpperCase();
// tspSignature = SHACoder.encodeSHA256Hex(tspSignature).toUpperCase();
//
// } catch (Exception e) {
// e.printStackTrace();
// }
// httpRequest
// .header("x-tsp-paasid","sgc-jg")
// .header("x-tsp-signature",tspSignature)
// .header("x-tsp-timestamp",tspTimestamp)
// .header("x-tsp-nonce", tspnonce)
// .header("x-tif-paasid","jgThinking")
// .header("x-tif-signature",tifSignature)
// .header("x-tif-timestamp",tifTimestamp)
// .header("x-tif-nonce",tifnonce)
// .header("Authorization","xxxx");
//// .header("x-tsp-serviceid","DGSP_1606192911177592833")
//// .header("x-tsp-appsecret","4961464000044bb6907e9b61d736d194");
String tifTimestamp = String.valueOf(new Date().getTime() / 1000);
String tspTimestamp = String.valueOf(new Date().getTime() / 1000);
String nonceTif = IdUtil.fastSimpleUUID();
String nonceTsp = IdUtil.fastSimpleUUID();
String tifSignature = tifTimestamp + "459c2793c1434cf781cc6ed644c29ecd" + nonceTif + tifTimestamp;
String tspSignature = tspTimestamp + "sgc-jg~sMO8Ha2" + nonceTsp + tspTimestamp;
// System.out.println(signature);
try {
tifSignature = SHACoder.encodeSHA256Hex(tifSignature).toUpperCase();
tspSignature = SHACoder.encodeSHA256Hex(tspSignature).toUpperCase();
} catch (Exception e) {
e.printStackTrace();
}
httpRequest
.header("x-tsp-paasid","sgc-jg")
.header("x-tsp-signature",tspSignature)
.header("x-tsp-timestamp",tspTimestamp)
.header("x-tsp-nonce", nonceTsp)
.header("x-tif-paasid","jgThinking")
.header("x-tif-signature",tifSignature)
.header("x-tif-timestamp",tifTimestamp)
.header("x-tif-nonce",nonceTif);
JSONObject reqJson = new JSONObject();
reqJson.put("content",1);
reqJson.put("receiveNo","20240311000002");
reqJson.put("receiver","1");
reqJson.put("contentType","提醒");
reqJson.put("type","inMail");
reqJson.put("msg_send_type","2-6");
String body = httpRequest.body(reqJson.toJSONString()).execute().body();
System.out.println(body);
}
/**
* 单点登录
@ -307,6 +371,27 @@ public class WaterRequestUtil {
return waterResult;
}
/**
* 发送消息通知
* @param messageType
* @param content
* @param userId
* @return
*/
public WaterResult sendMessage(String messageType,String content,String userId,String username){
JSONObject reqJson = new JSONObject();
reqJson.put("content",content);
reqJson.put("receiveNo",userId);
reqJson.put("receiver",username);
reqJson.put("type",messageType);
HttpRequest post = createPost(messageUrl , null, null);
String body = post.body(reqJson.toJSONString()).execute()
.body();
WaterResult waterResult = JSONObject.parseObject(body, WaterResult.class);
isSuccess(waterResult);
return waterResult;
}
private void isSuccess(WaterResult waterResult){

2
jwtech-admin/src/main/java/com/kms/config/WaterResult.java → jwtech-system/src/main/java/com/water/WaterResult.java

@ -1,4 +1,4 @@
package com.kms.config;
package com.water;
import lombok.AllArgsConstructor;
import lombok.Data;

2
jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectFeasibilityMapper.xml

@ -44,6 +44,8 @@
</where>
order by pf.${orderBy} desc LIMIT #{pageNum},#{pageSize};
</select>
<select id="getByUserPro" resultMap="SpecialProjectFeasibility">
select pf.id,
CASE

Loading…
Cancel
Save