From 17e7df980bbe81f40be8370482b03882706696af Mon Sep 17 00:00:00 2001 From: limingyu Date: Mon, 1 Apr 2024 19:19:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=8A=E6=9C=88=E6=A3=80=E6=9F=A5=E5=AE=9A?= =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1=E5=88=9B=E5=BB=BA=E6=9C=AA=E6=A3=80?= =?UTF-8?q?=E6=9F=A5=E6=95=B0=E6=8D=AE=E5=A4=B1=E8=B4=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zcloud/controller/system/LoginController.java | 6 +++--- .../com/zcloud/service/system/impl/CorpPathServiceImpl.java | 2 ++ src/main/java/com/zcloud/util/RecordHalfMonthScheduled.java | 3 ++- .../mybatis/datasource/firemanager/FireRecordMapper.xml | 5 +++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/zcloud/controller/system/LoginController.java b/src/main/java/com/zcloud/controller/system/LoginController.java index b18b7609..3ae08999 100644 --- a/src/main/java/com/zcloud/controller/system/LoginController.java +++ b/src/main/java/com/zcloud/controller/system/LoginController.java @@ -197,11 +197,11 @@ public class LoginController extends BaseController { // 如果用户不是港务局用户，则向对应分公司发送登录请求 if (!map.get("USER_IDENTITY").toString().equals("GWJ")) { - Map backEndPath = HttpClientUtil.getPOSTTest(map.get("BACK_END_PATH").toString() + "admin/check", pd); + Map backEndPath = HttpClientUtil.getPOSTTest(map.get("BACKENDADDR").toString() + "admin/check", loginPd); if (backEndPath.get("result").toString().equals("success")) { - backEndPath.put("baseImgPath",map.get("PIC_PATH").toString()); + backEndPath.put("baseImgPath",map.get("baseImgPath").toString()); backEndPath.put("USER_IDENTITY",map.get("USER_IDENTITY").toString()); - backEndPath.put("BACKENDADDR", map.get("BACK_END_PATH").toString()); + backEndPath.put("BACKENDADDR", map.get("BACKENDADDR").toString()); System.out.println("登录返回参数：" + backEndPath); return backEndPath; } else { diff --git a/src/main/java/com/zcloud/service/system/impl/CorpPathServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/CorpPathServiceImpl.java index 10c7e473..3792f176 100644 --- a/src/main/java/com/zcloud/service/system/impl/CorpPathServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/CorpPathServiceImpl.java @@ -35,6 +35,7 @@ public class CorpPathServiceImpl implements CorpPathService { PageData result = new PageData(); result.put("PIC_PATH",defaultPicPath); result.put("BACK_END_PATH", defaultBackEndPath); + result.put("USER_IDENTITY", "GWJ"); return result; } return data; @@ -53,6 +54,7 @@ public class CorpPathServiceImpl implements CorpPathService { PageData result = new PageData(); result.put("PIC_PATH",defaultPicPath); result.put("BACK_END_PATH", defaultBackEndPath); + result.put("USER_IDENTITY", "GWJ"); return result; } return data; diff --git a/src/main/java/com/zcloud/util/RecordHalfMonthScheduled.java b/src/main/java/com/zcloud/util/RecordHalfMonthScheduled.java index cb73d27b..4a152fb8 100644 --- a/src/main/java/com/zcloud/util/RecordHalfMonthScheduled.java +++ b/src/main/java/com/zcloud/util/RecordHalfMonthScheduled.java @@ -57,7 +57,7 @@ public class RecordHalfMonthScheduled { } } - @Scheduled(cron ="0 0 0 1,16 1-12 ?")//每月1号、16号 00:00 + @Scheduled(cron ="0 0 1 1,16 1-12 ?") //每月1号、16号 01:00 // @Scheduled(cron ="*/20 * * * * ?")//测试 public void equipmentNotChecked(){ System.out.println("============每半月定时增加超期未检查消防设备记录=========="); @@ -91,6 +91,7 @@ public class RecordHalfMonthScheduled { pageData.put("CORPINFO_ID", corpinfoId); pageData.put("PERIODSTART", finalStartTime); pageData.put("PERIODEND", finalEndTime); + pageData.put("PHONE_REPEAT", "1"); //'添加人''添加时间''修改人''修改时间' pageData.put("CREATOR", "adminTask"); pageData.put("CREATTIME", DateUtil.date2Str(new Date())); diff --git a/src/main/resources/mybatis/datasource/firemanager/FireRecordMapper.xml b/src/main/resources/mybatis/datasource/firemanager/FireRecordMapper.xml index 075e710a..e5525d2d 100644 --- a/src/main/resources/mybatis/datasource/firemanager/FireRecordMapper.xml +++ b/src/main/resources/mybatis/datasource/firemanager/FireRecordMapper.xml @@ -54,7 +54,7 @@ INSERT INTO `qa-gwj-prevention`.`bus_fire_record` (`FIRE_RECORD_ID`, `FIRE_CHECK_ID`, `CORPINFO_ID`, `CREATOR`, `CREATTIME`,REPEATCHECK, - `OPERATOR`, `OPERATTIME`, `PERIODSTART`, `PERIODEND`) VALUES + `OPERATOR`, `OPERATTIME`, `PERIODSTART`, `PERIODEND`, `PHONE_REPEAT`) VALUES ( #{item.FIRE_RECORD_ID}, @@ -66,7 +66,8 @@ #{item.OPERATOR}, #{item.OPERATTIME}, #{item.PERIODSTART}, - #{item.PERIODEND} + #{item.PERIODEND}, + #{item.PHONE_REPEAT} )