分支备注-手机号登录系统

src/main/java/com/bonus/boot/manager/app/controller/AppController.java

@@ -416,7 +416,7 @@ public class AppController {
         String telephone =  AesCbcUtils.decrypt(loginUser.getTelephone());
         loginUser.setTelephone(telephone);
         LoginUser listBean= appservice.checkAccountExist(loginUser);
-        if(StringHelper.isEmpty(listBean.getUsername())){
+        /*if(StringHelper.isEmpty(listBean.getUsername())){
             res.setResMsg("fail");
             res.setResMsg("noThisPhone");
         }else if(telephone != null && !telephone.equals(jwtToken)){
@@ -434,6 +434,22 @@ public class AppController {
             UserMap.loginUser(UUID, listBean);
             res.setResMsg("success");
             res.setObj(token);
+        }*/
+        if(StringHelper.isEmpty(listBean.getPhone())){
+            res.setResMsg("fail");
+            res.setResMsg("noThisPhone");
+        }else {
+            loginUser.setId(listBean.getId());
+            loginUser.setIfJob(listBean.getIfJob());
+            loginUser.setSex(listBean.getSex());
+            loginUser.setSpecialJob(listBean.getSpecialJob());
+            loginUser.setIfHigher(listBean.getIfHigher());
+            String token = tokenService.saveTokenNoPassword(loginUser);
+            loginUser.setToken(token);
+            String UUID = loginUser.getToken();
+            UserMap.loginUser(UUID, listBean);
+            res.setResMsg("success");
+            res.setObj(token);
         }
         return res;
     }

src/main/java/com/bonus/boot/manager/app/service/impl/AppserviceImpl.java

@@ -110,7 +110,7 @@ public class AppserviceImpl implements Appservice {
             int pm = appserviceDao.appointSave(pmbean);
             int mealid = Integer.parseInt(pmbean.getSetMealId());
             //标准化预约信息套餐内容进行保存
-            int standid = appserviceDao.getstandByid();
+//            int standid = appserviceDao.getstandByid();
             //获取体检项目内容
             if ("3".equals(pmbean.getSetMealType()) && "35".equals(pmbean.getHospitalId())){
                 teamstatus = 1;
@@ -119,7 +119,7 @@ public class AppserviceImpl implements Appservice {
                 String hospital = appserviceDao.hospitalNames(pmbean.getHospitalId());
                 SendPhoneMsg(phone,name+"您好，您已成功预约："+pmbean.getPhyAppontTime()+hospital+"的体检，请准时前往。");
             }else {
-                List<PmPhyCombinBean> beaninfo = appserviceDao.getAllpmphyCombin(mealid, standid);
+                List<PmPhyCombinBean> beaninfo = appserviceDao.getAllpmphyCombin(mealid, 0);
                 for (int i = 0; i < beaninfo.size(); i++) {
                     //保存到体检人员的体检表中，做历史数据的查询
                     corrent.setAppontId(pmbean.getId() + "");
@@ -162,7 +162,7 @@ public class AppserviceImpl implements Appservice {
     }
     public static void SendPhoneMsg(String phone, String msg){
         String url = "http://api.ktsms.cn/sms_token?ddtkey=bonus&secretkey=KtyBns@Admin2023!";
-        String uri = url+"&mobile="+ phone + "&content=【云南体检预约】" + msg;
+        String uri = url+"&mobile="+ phone + "&content=【博诺思】" + msg;
         HttpRequest.post(uri).execute(false).body();
 //            try {
 //                Thread.sleep(5000);
@@ -233,7 +233,7 @@ public class AppserviceImpl implements Appservice {
         Random random = new Random();
         int code = random.nextInt(9000) + 1000;
         String url = "http://api.ktsms.cn/sms_token?ddtkey=bonus&secretkey=KtyBns@Admin2023!";
-        String uri = url+"&mobile="+ user.getTelephone() + "&content=【云南体检预约】提醒您，您的登录验证码是："+code ;
+        String uri = url+"&mobile="+ user.getTelephone() + "&content=【博诺思】提醒您，您的登录验证码是："+code ;
         HttpRequest.post(uri).execute(false).body();
         return code+"";
     }

src/main/resources/application.properties

@@ -14,13 +14,13 @@ spring.datasource.url=jdbc:mysql://192.168.1.8:23342/yn_tj_appoint?useUnicode=tr
 spring.datasource.username=root
 spring.datasource.password=Bonus@yntj123!
 #\u6D4B\u8BD5\u5E93
-#spring.datasource.url=jdbc:mysql://192.168.0.14:1115/yn_tj_appoint?useSSL=false&allowMultiQueries=true&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
+#spring.datasource.url=jdbc:mysql://192.168.0.14:4418/yn_tj_appoint?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false
 #spring.datasource.username=root
-#spring.datasource.password=xbzadmin@szedu14!
+#spring.datasource.password=Bonus@admin123!
 #\u672C\u5730\u5E93
-#spring.datasource.url=jdbc:mysql://192.168.0.14:1115/yn_tj_appoint?useSSL=false&allowMultiQueries=true&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
+#spring.datasource.url=jdbc:mysql://localhost:13306/yn_tj_appoint?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
-#spring.datasource.username=root
+#spring.datasource.username=lSun
-#spring.datasource.password=xbzadmin@szedu14!
+#spring.datasource.password=liang971108@Sun
 
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.max-idle=10
@@ -39,12 +39,12 @@ spring.redis.port=23347
 spring.redis.password=Bonus@yntj123!
 #\u6D4B\u8BD5
 #spring.redis.host=192.168.0.14
-#spring.redis.port=2001
+#spring.redis.port=2004
-#spring.redis.password=Dszbns@Redis123!
+#spring.redis.password=Plzbns@Redis123!
 #\u672C\u5730
 #spring.redis.host=127.0.0.1
 #spring.redis.port=6379
-#spring.redis.password=
+#spring.redis.password=liang971108lu@L
 # \u65E5\u5FD7
 logging.config=classpath:logback-boot.xml
 log.level.root=info

src/main/resources/mappers/app/AppMapper.xml

@@ -106,7 +106,7 @@
         FROM
             pm_base_physical pbp
         LEFT JOIN
-            pm_phy_organization ppo ON ppo.id = pbp.depart_id
+            pm_organization ppo ON ppo.id = pbp.depart_id
         where
            pbp.id=#{id} and pbp.is_active='1'
     </select>
@@ -375,18 +375,14 @@
     </select>
     <select id="getPhysicalExamination" resultType="com.bonus.boot.manager.app.beans.HospitalBean">
         SELECT
-            set_meal as id,
+            pbp.base_name_id as id,
-            case set_meal
+            pn.type_name as text
-                when '1' then '心血管'
-                when '2' then '肿瘤'
-                when '3' then '综合'
-                else ''
-            end as text
         FROM
-            pm_base_physical
+            pm_base_physical pbp
+                LEFT JOIN pm_base_type_package_name pn ON pbp.base_name_id = pn.id
         WHERE
-            idcard = #{idcard}
+            pbp.idcard = #{idcard}
-            AND is_active = '1'
+          AND pbp.is_active = '1'
     </select>
     <select id="getCareerHospital" resultType="com.bonus.boot.manager.app.beans.HospitalBean">
         SELECT