预约取号，根据奉化要求修改

hmit-admin/src/main/resources/application-dev.yml

@@ -5,7 +5,8 @@ spring:
 #      driver-class-name: com.mysql.cj.jdbc.Driver
       driver-class-name: com.mysql.jdbc.Driver
 #      url: jdbc:mysql://112.51.130.215:3306/security_enterprise?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
-      url: jdbc:mysql://sh-cdb-jsrwe2i2.sql.tencentcdb.com:60548/bl_appointment?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
+#      url: jdbc:mysql://sh-cdb-jsrwe2i2.sql.tencentcdb.com:60548/bl_appointment?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
+      url: jdbc:mysql://sh-cdb-jsrwe2i2.sql.tencentcdb.com:60548/fh_appointment?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
       username: root
       password: Hmit@2020
 #      #Oracle

hmit-api/src/main/java/io/hmit/config/ZhelibanAPP.java

@@ -20,9 +20,12 @@ public class ZhelibanAPP {
 
 
 
-    //手机
-    public static final String SERVICE_CODE = "blzwfwyyqhxt";
-    public static final String SERVICE_PASS = "blzwfwyyqhxtpwd";
+    //北仑的个人认证接入码
+//    public static final String SERVICE_CODE = "blzwfwyyqhxt";
+//    public static final String SERVICE_PASS = "blzwfwyyqhxtpwd";
+    //奉化的个人认证接入码
+    public static final String SERVICE_CODE = "fhzwfwyyqh";
+    public static final String SERVICE_PASS = "fhzwfwyyqhpwd";
 //    public static final String APP_BASE_URL = "https://puser.zjzwfw.gov.cn/sso/servlet/simpleauth?method=";
     public static final String APP_BASE_URL = "https://appapi.zjzwfw.gov.cn/sso/servlet/simpleauth?method=";
     public static final String VALIDATION_TICKET = "ticketValidation";

hmit-api/src/main/java/io/hmit/modules/appointment/controller/AppointmentOrderController.java

@@ -203,7 +203,8 @@ public class AppointmentOrderController {
 
             //调用取号机取号接口，获取取号信息，并更新预约号。
 //         http://IP:8223/smartqueue/yynumber?sQueueInfoID=24&time=1613389800&sign=ee2c3fc1bdabf439f00aa90af6a0a68f&sTel=13988888888&sName=王小二&sCardID=333111123456
-            String url = "http://192.168.1.97:8223/smartqueue/yynumber?" +
+//    北仑        String url = "http://10.35.28.211:8223/smartqueue/yynumber?" +
+            String url = "http://172.19.240.230:8223/smartqueue/yynumber?" +
                     "sQueueInfoID=" +serviceId+
                     "&time="+ nowtime +
                     "&sign="+ MD5.md5(sign)+

hmit-api/src/main/java/io/hmit/modules/appointment/service/impl/AppointmentOrderServiceImpl.java

@@ -169,7 +169,8 @@ public class AppointmentOrderServiceImpl extends CrudServiceImpl<AppointmentOrde
     public YynumberDTO findByYuNumber(String sPaperNumber) {
         //调用取号机接口，。
 //        String url = "http://IP:8223/smartqueue/getpaperwait?sPaperNumber=" +sPaperNumber;
-        String url = "http://192.168.1.97:8223/smartqueue/getpaperwait?sPaperNumber=" +sPaperNumber;
+//   北仑     String url = "http://10.35.28.211:8223/smartqueue/getpaperwait?sPaperNumber=" +sPaperNumber;
+        String url = "http://172.19.240.230:8223/smartqueue/getpaperwait?sPaperNumber=" +sPaperNumber;
         String s = HttpRequestUtil.sendGetAndRetrieveContent(url);
 //        String s = "{\"nStatus\":1,\"sMsg\":\"号码已被呼叫\",\"nWait\":0,\"sCallTime\":\"2021-03-08 16:27:09\",\"sRegTime\":\"2021-03-08 16:26:55\",\"sQueueName\":\"不动产档案查询\",\"listWin\":[\"38号窗口\",\"39号窗口\",\"40号窗口\",\"41号窗口\",\"42号窗口\",\"43号窗口\"]}";
         YynumberDTO yynumberDTO = JSONObject.parseObject(s,YynumberDTO.class);

hmit-api/src/main/java/io/hmit/modules/appointment/service/impl/AppointmentTimeManageServiceImpl.java

@@ -85,7 +85,7 @@ public class AppointmentTimeManageServiceImpl extends CrudServiceImpl<Appointmen
 
         List<ReservationTimeDTO> reservationTimeDTOList = new ArrayList<>();
 
-        List<CalendarDTO> dayLists = calendarService.weekDayList().subList(0,6);
+        List<CalendarDTO> dayLists = calendarService.weekDayList().subList(0,7);
         dayLists.stream().forEach(item->{
             ReservationTimeDTO reservationTime = new ReservationTimeDTO();
             reservationTime.setReservationTime(item.getDay());

hmit-api/src/main/java/io/hmit/modules/appointment/service/impl/CalendarServiceImpl.java

@@ -38,8 +38,13 @@ public class CalendarServiceImpl extends CrudServiceImpl<CalendarDao, CalendarEn
     @Override
     public List<CalendarDTO> weekDayList() {
         String now = DateUtils.format(new Date());
+        //获取工作日的日期，用于北仑
+//        List<CalendarEntity> calendarList = baseDao.selectList(new QueryWrapper<CalendarEntity>().gt("day",now)
+//        .ne("holiday",1).ne("holiday",2));
+        //获取包含工作日和周末的日期，用于奉化
         List<CalendarEntity> calendarList = baseDao.selectList(new QueryWrapper<CalendarEntity>().gt("day",now)
-        .ne("holiday",1).ne("holiday",2));
+                .ne("holiday",2));
+
 
         return ConvertUtils.sourceToTarget(calendarList,CalendarDTO.class);
     }

hmit-api/src/main/resources/application-dev.yml

@@ -4,7 +4,8 @@ spring:
 #      driver-class-name: com.mysql.cj.jdbc.Driver
       driver-class-name: com.mysql.jdbc.Driver
 #      url: jdbc:mysql://112.51.130.215:3306/security_enterprise?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
-      url: jdbc:mysql://sh-cdb-jsrwe2i2.sql.tencentcdb.com:60548/bl_appointment?autoReconnect=true&useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&useSSL=false
+#      url: jdbc:mysql://sh-cdb-jsrwe2i2.sql.tencentcdb.com:60548/bl_appointment?autoReconnect=true&useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&useSSL=false
+      url: jdbc:mysql://sh-cdb-jsrwe2i2.sql.tencentcdb.com:60548/fh_appointment?autoReconnect=true&useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&useSSL=false
       username: root
       password: Hmit@2020
       initial-size: 10