2022年8月26日18时48分

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitoringAlarms/controller/MonitoringAlarmsController.java

@@ -81,7 +81,7 @@ public class MonitoringAlarmsController {
                                      @RequestParam(value = "token") String token) {
         String retStr = OpenApi.queryAlarmList(MonitoringAlarms.API_PREFIX_DEV, token);
         JSONObject result = JSON.parseObject(retStr);
-        if ("200".equals(result.get("code"))) {
+        if ("OK".equals(result.get("rmsg"))) {
             List<TMonitoringAlarms> list = JSONArray.parseArray(result.get("data").toString(), TMonitoringAlarms.class);
             for (TMonitoringAlarms tMonitoringAlarms : list) {
                 TMonitoringAlarms alarms =  tMonitoringAlarmsService.selectTMonitoringAlarmsById(tMonitoringAlarms.getId());

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitoringAlarms/main/OpenApi.java

@@ -87,11 +87,11 @@ public class OpenApi {
         queryAlarmInfoListBean.setNonce(VerifyCodeUtils.generateVerifyCode(6));
         queryAlarmInfoListBean.setToken(token);
         // queryAlarmInfoListBean.setAlarmType(2);
-        queryAlarmInfoListBean.setEndTime(0);
-        queryAlarmInfoListBean.setEndTime(0);
+//        queryAlarmInfoListBean.setEndTime(0);
+//        queryAlarmInfoListBean.setEndTime(0);
         queryAlarmInfoListBean.setPageSize(20);
         queryAlarmInfoListBean.setPageNum(1);
-        queryAlarmInfoListBean.setProjectId(234);
+//        queryAlarmInfoListBean.setProjectId(234);
 
         String sign = RequestUtils.getParameterSignature(queryAlarmInfoListBean);
         queryAlarmInfoListBean.setSign(sign);

ruoyi-admin/src/main/java/com/ruoyi/web/controller/plugin/CcbController.java

@@ -1,5 +1,6 @@
 package com.ruoyi.web.controller.plugin;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
@@ -15,6 +16,7 @@ import com.ruoyi.common.core.domain.entity.TWarehouse;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.JsonUtil;
 import com.ruoyi.common.utils.ShaUtil;
+import com.ruoyi.system.service.ISysConfigService;
 import com.ruoyi.warehouse.warehouse.domain.TMonitoringAlarms;
 import com.ruoyi.warehouse.warehouse.service.ITMonitoringAlarmsService;
 import lombok.AllArgsConstructor;
@@ -26,8 +28,6 @@ import org.springframework.web.bind.annotation.*;
 
 import java.io.IOException;
 import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -55,6 +55,9 @@ public class CcbController {
     @Autowired
     private ITMonitoringAlarmsService itMonitoringAlarmsService;
 
+    @Autowired
+    private ISysConfigService iSysConfigServicer;
+
     /**
      * 查询保管凭证号
      *
@@ -339,6 +342,11 @@ public class CcbController {
 
         System.out.println("请求内容：" + JsonUtil.toJson(deviceAlarm));
 
+        String configValue = iSysConfigServicer.selectConfigByKey("bank.url");
+        if (ObjectUtil.isNull(configValue) && "".equals(configValue)) {
+            return AjaxResult.error("请求银行地址异常");
+        }
+
         String requestTime = DateUtils.dateTimeNow() + (Math.random() * 9 + 1) * 100000;
         // 签名内容
         String str = "appId=" + CcbConstants.APP_ID + "&"
@@ -355,7 +363,7 @@ public class CcbController {
                 .addHeader("X-RC-SignType", "SHA256")
                 .addHeader("X-RC-RequestTime", requestTime)
                 .addHeader("X-RC-RLF-Uid", CcbConstants.PLATFORM_ID)
-                .url(CcbConstants.DEVICE_ALARM)
+                .url(configValue + CcbConstants.DEVICE_ALARM)
                 .post(okhttp3.RequestBody.create(okhttp3.MediaType.parse("application/json; charset=utf-8"), JsonUtil.toJson(deviceAlarm)))
                 .build();
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/appHold/AppWarehouseController.java

@@ -281,6 +281,7 @@ public class AppWarehouseController extends BaseController {
         tWarehousebillsitemsElabel.setfGPid(itemId);*/
         tWarehousebillsitemsElabel.setfType(type);
         tWarehousebillsitemsElabel.setfContent(fContent);
+        tWarehousebillsitemsElabel.setfStatus(0);
         List<TWarehousebillsitemsElabel> tWarehousebillsitemsElabelList = labelService.selectItemsElabelList(tWarehousebillsitemsElabel);
         if (tWarehousebillsitemsElabelList.size() != 0) {
             return AjaxResult.error("该标签号:" + fContent + "已扫描，请重新录入");

ruoyi-common/src/main/java/com/ruoyi/common/constant/CcbConstants.java

@@ -3,11 +3,14 @@ package com.ruoyi.common.constant;
 
 public class CcbConstants {
 
-    public static final String IN_URL = "http://124.127.94.35:6066/api/cargo/inCargoResp";
+//    public static final String IN_URL = "http://124.127.94.35:6066/api/cargo/inCargoResp";
+    public static final String IN_URL = "/api/cargo/inCargoResp";
 
-    public static final String OUT_URL = "http://124.127.94.35:6066/api/cargo/outCargoResp";
+//    public static final String OUT_URL = "http://124.127.94.35:6066/api/cargo/outCargoResp";
+    public static final String OUT_URL = "/api/cargo/outCargoResp";
 
-    public static final String DEVICE_ALARM = "http://124.127.94.35:6066/api/alarm/deviceAlarm";
+//    public static final String DEVICE_ALARM = "http://124.127.94.35:6066/api/alarm/deviceAlarm";
+    public static final String DEVICE_ALARM = "/api/alarm/deviceAlarm";
 
     public static final String SUCCESS = "Y";
 

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseBillsServiceImpl.java

@@ -4357,6 +4357,11 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
 
                     String sign = ShaUtil.sha256(str);
 
+                    SysConfig feedbackConfig1 = sysConfigMapper.checkConfigKeyUnique("bank.url");
+                    if (ObjectUtil.isNull(feedbackConfig1) && "".equals(feedbackConfig1.getConfigKey())) {
+                        return AjaxResult.error("请求银行地址异常");
+                    }
+
                     OkHttpClient okHttpClient = new OkHttpClient();
                     Request request = new Request.Builder()
                             .addHeader("content-type", "application/json")
@@ -4365,7 +4370,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                             .addHeader("X-RC-SignType", "SHA256")
                             .addHeader("X-RC-RequestTime", requestTime)
                             .addHeader("X-RC-RLF-Uid", CcbConstants.PLATFORM_ID)
-                            .url(CcbConstants.IN_URL)
+                            .url(feedbackConfig1.getConfigKey() + CcbConstants.IN_URL)
                             .method("post", RequestBody.create(okhttp3.MediaType.parse("application/json; charset=utf-8"), JsonUtil.toJson(rsp)))
                             .post(RequestBody.create(okhttp3.MediaType.parse("application/json; charset=utf-8"), JsonUtil.toJson(rsp)))
                             .build();
@@ -4728,6 +4733,10 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                                 + "requestTime=" + requestTime + "&"
                                 + "body=" + JsonUtil.toJson(rsp);
 
+                        SysConfig feedbackConfig1 = sysConfigMapper.checkConfigKeyUnique("bank.url");
+                        if (ObjectUtil.isNull(feedbackConfig1) && "".equals(feedbackConfig1.getConfigKey())) {
+                            return AjaxResult.error("请求银行地址异常");
+                        }
 
                         System.out.println("出库请求数据：" + JsonUtil.toJson(rsp));
 
@@ -4739,7 +4748,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                                 .addHeader("X-RC-SignType", "SHA256")
                                 .addHeader("X-RC-RequestTime", requestTime)
                                 .addHeader("X-RC-RLF-Uid", CcbConstants.PLATFORM_ID)
-                                .url(CcbConstants.OUT_URL)
+                                .url(feedbackConfig1.getConfigKey() + CcbConstants.OUT_URL)
                                 .post(RequestBody.create(okhttp3.MediaType.parse("application/json; charset=utf-8"), JsonUtil.toJson(rsp)))
                                 .build();
 

ruoyi-warehouse/src/main/resources/mapper/warehouse/TMonitoringAlarmsMapper.xml

@@ -78,6 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertTMonitoringAlarms" parameterType="TMonitoringAlarms" useGeneratedKeys="true" keyProperty="id">
         insert into t_monitoring_alarms
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
             <if test="createDate != null">create_date,</if>
             <if test="updateDate != null">update_date,</if>
             <if test="alarmDate != null">alarm_date,</if>
@@ -104,6 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="companyName != null">company_name,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
             <if test="createDate != null">#{createDate},</if>
             <if test="updateDate != null">#{updateDate},</if>
             <if test="alarmDate != null">#{alarmDate},</if>