From 8b662dd468bf17b5fef278874f5de36f229795f1 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 30 十月 2024 19:02:41 +0800
Subject: [PATCH] 代码初始化
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/EmayService.java | 6 -
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunController.java | 10 ++-
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java | 14 ++++
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/PlatformJobRunBoardVO.java | 8 ++
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/SecurityController.java | 21 +++++++
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/VisitDataVO.java | 42 ++++++++++++++
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java | 32 +++++-----
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/TransportMeasureVO.java | 5 +
server/system_service/src/main/resources/mappers/SystemUserMapper.xml | 2
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java | 15 +++++
10 files changed, 129 insertions(+), 26 deletions(-)
diff --git a/server/system_service/src/main/resources/mappers/SystemUserMapper.xml b/server/system_service/src/main/resources/mappers/SystemUserMapper.xml
index 1554fc5..a17fab9 100644
--- a/server/system_service/src/main/resources/mappers/SystemUserMapper.xml
+++ b/server/system_service/src/main/resources/mappers/SystemUserMapper.xml
@@ -75,7 +75,7 @@
<if test="dto.companyType != null ">
AND sd.`type` = #{dto.companyType}
</if>
- <if test="dto.querySpecial != null and dto.querySpecial = 1 ">
+ <if test="dto.querySpecial != null and dto.querySpecial == 1 ">
AND find_in_set(#{dto.companySpecialId},REPLACE(sd.company_path,"/",","))
</if>
</where>
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunController.java
index 2cd9eba..59cb126 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunController.java
@@ -1,5 +1,6 @@
package com.doumee.cloud.board;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.doumee.api.BaseController;
import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.core.annotation.excel.ExcelColumn;
@@ -17,6 +18,7 @@
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
@@ -41,7 +43,7 @@
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/board/api/platformJobRun")
public class PlatformJobRunController extends BaseController {
- @ApiModelProperty
+ @Autowired
private PlatformJobJoinMapper platformJobJoinMapper;
@LoginNoRequired
@@ -63,7 +65,8 @@
data.setTodayOutRata(new BigDecimal(random.nextInt(100)));
data.setMonthOutRata(data.getTodayOutRata().multiply(new BigDecimal(30)));
-
+ data.setStockMax(new BigDecimal(random.nextInt(1000)));
+ data.setStockTotal(new BigDecimal(data.getStockMax().intValue()));
return ApiResponse.success(data);
}
@@ -85,7 +88,8 @@
}
for (String str:dayList) {
TransportMeasureVO data = new TransportMeasureVO();
- data.setPlanTimes(str);
+ data.setPlanDate(str);
+ data.setPlanTimes(random.nextInt(200));
data.setPlanTaskNum(new BigDecimal(random.nextInt(1000)));
data.setFinishTaskNum(new BigDecimal(data.getPlanTaskNum().intValue()));
list.add(data);
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/SecurityController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/SecurityController.java
index 0622588..0aeaa35 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/SecurityController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/SecurityController.java
@@ -101,4 +101,25 @@
}
+ @LoginNoRequired
+ @ApiOperation("璁垮鍒嗘瀽")
+ @GetMapping("/getVisitData")
+ public ApiResponse<VisitDataVO> getVisitData() {
+ VisitDataVO visitDataVO = new VisitDataVO();
+ Random random = new Random();
+ visitDataVO.setRegisterVisitNum(random.nextInt(20));
+ visitDataVO.setRegisterVisitRata(BigDecimal.valueOf(random.nextInt(20)));
+ visitDataVO.setLevelNum(random.nextInt(20));
+ visitDataVO.setLevelRata(BigDecimal.valueOf(random.nextInt(20)));
+ visitDataVO.setWaitVisitNum(random.nextInt(20));
+ visitDataVO.setWaitVisitRata(BigDecimal.valueOf(random.nextInt(20)));
+ visitDataVO.setRetentionNum(random.nextInt(20));
+ visitDataVO.setRetentionRata(BigDecimal.valueOf(random.nextInt(20)));
+ return ApiResponse.success(visitDataVO);
+ }
+
+
+
+
+
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
index 143549b..873bdc2 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
@@ -754,10 +754,25 @@
}
}
+ /**
+ * 鑾峰彇鑿滃崟
+ * @param body
+ * @return
+ */
public static String getHkMenu(Map<String,String> body) {
return startDoGetStringArtemis(HKConstants.InterfacePath.getMenus,body);
}
+
+ /**
+ * 鍙戦�佺煭淇￠獙璇佺爜
+ * @param body
+ * @return
+ */
+ public static String sendSms(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.sendSms,body);
+ }
+
/**
* 鑾峰彇鏈堝彴缁勪欢閰嶇疆鐨凩ED璁惧娓呭崟
* @param body
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
index e1b202c..a790359 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
@@ -1467,21 +1467,6 @@
return null;
}
- public static BaseResponse sendSmsByHk(Map<String,Object> param,String url){
- log.info("銆愭捣搴峰彂閫佺煭淇°��================寮�濮�===="+JSONObject.toJSONString(param));
- try {
- TypeReference typeReference =
- new TypeReference<BaseResponse>(){};
- String res = HttpsUtil.postJson(url, JSONObject.toJSONString(param));
- BaseResponse result = JSONObject.parseObject(res, typeReference.getType());
- logResult(result,"娴峰悍鍙戦�佺煭淇�");
- return result;
- }catch (Exception e){
- log.error("銆愭捣搴峰彂閫佺煭淇°��================澶辫触====锛歕n"+ e.getMessage());
- e.printStackTrace();
- }
- return null;
- }
@@ -1502,6 +1487,23 @@
}
+ public static BaseResponse sendSms(Map<String,Object> param){
+ log.info("銆愬彂閫佺煭淇′俊鎭��================寮�濮�===="+ JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.sendSms(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference<BaseResponse>(){};
+ BaseResponse result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"鍙戦�佺煭淇′俊鎭�");
+ return result;
+ }catch (Exception e){
+ log.error("銆愬彂閫佺煭淇′俊鎭��================澶辫触====锛歕n"+ e.getMessage());
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+
private static void logResult(BaseResponse res,String name) {
if(StringUtils.equals(res.getCode(),HKConstants.RESPONSE_SUCCEE)){
log.info("銆�"+name+"銆�================鎴愬姛====\n"+res);
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/PlatformJobRunBoardVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/PlatformJobRunBoardVO.java
index 31e7902..310282a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/PlatformJobRunBoardVO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/PlatformJobRunBoardVO.java
@@ -46,6 +46,14 @@
@ApiModelProperty(value = "鏈湀鍏ュ簱鏁堢巼")
private BigDecimal monthInRata;
+ @ApiModelProperty(value = "搴撳瓨鏈�澶у��")
+ private BigDecimal stockMax;
+
+ @ApiModelProperty(value = "褰撳墠搴撳瓨")
+ private BigDecimal stockTotal;
+
+
+
@ApiModelProperty(value = "杩愯緭浠诲姟鍒嗘瀽 - 7鏃�" , hidden = true)
private List<TransportMeasureVO> transportMeasureWeekList;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/TransportMeasureVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/TransportMeasureVO.java
index 49d793c..baa6cdc 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/TransportMeasureVO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/TransportMeasureVO.java
@@ -21,6 +21,9 @@
private BigDecimal finishTaskNum;
@ApiModelProperty(value = "璁″垝浠诲姟鏁�")
- private String planTimes;
+ private Integer planTimes;
+
+ @ApiModelProperty(value = "鏃ユ湡")
+ private String planDate;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/VisitDataVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/VisitDataVO.java
new file mode 100644
index 0000000..555677f
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/VisitDataVO.java
@@ -0,0 +1,42 @@
+package com.doumee.dao.web.response.platformReport;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 璁垮鍒嗘瀽
+ *
+ * @Author : Rk
+ * @create 2024/10/25 10:59
+ */
+@Data
+public class VisitDataVO {
+
+ @ApiModelProperty(value = "寰呰闂暟閲�")
+ private Integer waitVisitNum;
+
+ @ApiModelProperty(value = "寰呰闂崰姣�")
+ private BigDecimal waitVisitRata;
+
+ @ApiModelProperty(value = "宸茬櫥璁版暟閲�")
+ private Integer registerVisitNum;
+
+ @ApiModelProperty(value = "宸茬櫥璁板崰姣�")
+ private BigDecimal registerVisitRata;
+
+ @ApiModelProperty(value = "宸茬寮�鏁伴噺")
+ private Integer levelNum;
+
+ @ApiModelProperty(value = "宸茬寮�鍗犳瘮")
+ private BigDecimal levelRata;
+
+ @ApiModelProperty(value = "婊炵暀鏁伴噺")
+ private Integer retentionNum;
+
+ @ApiModelProperty(value = "婊炵暀鍗犳瘮")
+ private BigDecimal retentionRata;
+
+
+}
\ No newline at end of file
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
index 0145eaa..d1ca0f1 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
@@ -973,6 +973,8 @@
.eq(VisitPark::getObjType,Constants.ONE)
.eq(VisitPark::getHkStatus,Constants.ONE)
.isNotNull(VisitPark::getHkId)
+ .apply(" END_TIME > now() ")
+ .orderByDesc(VisitPark::getCreateDate)
);
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(visitParkList)){
for (VisitPark visitPark:visitParkList) {
@@ -1209,9 +1211,16 @@
if(Objects.isNull(platformJob)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
+
if(!Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.CALLED.getKey())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧�,涓氬姟鐘舵�佸凡娴佽浆锛�");
}
+
+ Platform platform = platformJoinMapper.selectById(jobOperateDTO.getPlatformId());
+ if(Objects.isNull(platform)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鏈堝彴淇℃伅");
+ }
+
PlatformJob oldPlatformJob = new PlatformJob();
BeanUtils.copyProperties(platformJob,oldPlatformJob);
@@ -1226,7 +1235,10 @@
emayService,smsEmailMapper,smsConfigMapper,platformJobMapper,platformJob.getId(),
SmsConstants.platformJobContent.platformJobOverNum,null,null
);
-
+ platformJob.setPlatformName(platform.getName());
+ this.broadcastAndLEed(platformJob, StringUtils.isBlank(platform.getLedContent())?Constants.PlatformLedContent.IDEL_CONTNET.getName():platform.getLedContent(),
+ null
+ );
return platformJob;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/EmayService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/EmayService.java
index 128f8aa..9dac56c 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/EmayService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/EmayService.java
@@ -99,14 +99,10 @@
public void sendSmsByHk(String phone,String content){
try {
- String url = systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.HK_HTTPS).getCode() +
- systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.HK_HOST).getCode() +
- HKConstants.ARTEMIS_PATH +
- HKConstants.InterfacePath.sendSms[0];
Map<String,Object> map = new HashMap<>();
map.put("phoneNo",phone.split(","));
map.put("content",content);
- BaseResponse result = HKService.sendSmsByHk(map,url);
+ BaseResponse result = HKService.sendSms(map);
if(result !=null){
if(!StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE)){
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),result.getMsg());
--
Gitblit v1.9.3