apk调试

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

@@ -16,10 +16,8 @@ import com.bonus.boot.manager.manager.utils.*;
 import io.jsonwebtoken.Claims;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.PostMapping;
+
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
 import java.util.*;
 
@@ -45,6 +43,7 @@ public class AppController {
      * @return
      */
     @PostMapping("/getStatus")
+    @ResponseBody
     public AjaxRes getStatus(SysUser user) {
         AjaxRes ar = new AjaxRes();
         //String passworld = UserUtil.getLoginUser().getPassword();
@@ -58,7 +57,6 @@ public class AppController {
             user.setStatus(Integer.parseInt(status));
             user.setPersonnelType(String.valueOf(personnelType));
         }
-
         if (status != null) {
             ar.setRes(1);
             ar.setResMsg("success");
@@ -207,6 +205,9 @@ public class AppController {
         if (save == 1) {
             ar.setRes(1);
             ar.setResMsg("success");
+        }else if(save == 0){
+            ar.setRes(2);
+            ar.setResMsg("已预约，请先取消预约");
         } else {
             ar.setRes(0);
             ar.setResMsg("error");

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

@@ -77,6 +77,11 @@ public class AppserviceImpl implements Appservice {
      */
     @Override
     public int appointSave(PmBasePhyAppontBean pmbean) {
+        //先判断当前账号是否预约过，预约过则返回已预约
+        int status = getphyappoint(pmbean.getSetMealType());
+        if(status>0){
+            return 0;
+        }
         AppontPhyCorrelationBean corrent = new AppontPhyCorrelationBean();
         String ifJob = UserUtil.getLoginUser().getIfJob();
         String ifHigher = UserUtil.getLoginUser().getIfHigher();

src/main/resources/application.properties

@@ -1,6 +1,6 @@
 #\u8BBF\u95EE\u7AEF\u53E3
 #\u6B63\u5F0F\u7AEF\u53E3
-server.port=18089
+server.port=19100
 #\u6D4B\u8BD5\u7AEF\u53E3
 #server.port=1907
 #\u672C\u5730\u7AEF\u53E3
@@ -10,13 +10,13 @@ server.port=18089
 #\u8BBF\u95EE\u8DEF\u5F84
 server.servlet.context-path=/AppPeaManager
 #\u6B63\u5F0F\u5E93
-#spring.datasource.url=jdbc:mysql://192.168.1.8:23342/yn_tj_appoint?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
+spring.datasource.url=jdbc:mysql://192.168.1.8:23342/yn_tj_appoint?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
-#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.username=root
-spring.datasource.password=xbzadmin@szedu14!
+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.username=root
+#spring.datasource.password=xbzadmin@szedu14!
 #\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.username=root
@@ -34,17 +34,17 @@ mybatis.mapper-locations=classpath:mappers/*/*Mapper.xml
 mybatis.type-aliases-package=com.bonus.boot.manager.*.entity
 
 #\u7EBF\u4E0A
-#spring.redis.host=192.168.1.4
+spring.redis.host=192.168.1.8
-#spring.redis.port=6379
+spring.redis.port=23347
-#spring.redis.password=Ynsmz@186redis!
+spring.redis.password=Bonus@yntj123!
 #\u6D4B\u8BD5
-#spring.redis.host=192.168.1.8
+#spring.redis.host=192.168.0.14
-#spring.redis.port=23347
+#spring.redis.port=2001
-#spring.redis.password=Bonus@yntj123!
+#spring.redis.password=Dszbns@Redis123!
 #\u672C\u5730
-spring.redis.host=127.0.0.1
+#spring.redis.host=127.0.0.1
-spring.redis.port=6379
+#spring.redis.port=6379
-spring.redis.password=
+#spring.redis.password=
 # \u65E5\u5FD7
 logging.config=classpath:logback-boot.xml
 log.level.root=info

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

@@ -5,9 +5,9 @@
     <insert id="appointSave" parameterType="com.bonus.boot.manager.app.beans.PmBasePhyAppontBean"  useGeneratedKeys="true" keyProperty="id">
 
          insert into pm_base_phy_appont(hospital_id,user_id,phy_appont_time,sex,if_edu,person_type,check_content_id,
-                    if_career_appoint,comb_name,is_special)
+                    if_career_appoint,comb_name,is_special,appont_time)
             values (#{hospitalId},#{userId},#{phyAppontTime},#{sex},#{ifEdu},#{personType},#{checkId},
-                    #{ifCareerAppoint},#{combName},#{specialJob})
+                    #{ifCareerAppoint},#{combName},#{specialJob},NOW())
     </insert>
     <insert id="mealsave" parameterType="com.bonus.boot.manager.app.beans.AppontPhyCorrelationBean" >
         insert into appont_phy_correlation(appont_id,meal_name,meal_content,meal_price)
@@ -74,22 +74,25 @@
     </select>
     <select id="getpersonappointInfo" resultType="com.bonus.boot.manager.app.beans.PmBasePhyAppontBean">
         SELECT
-            pbpa.id,
+        pbpa.id,
-            pbh.hospital as hospitalName,
+        pbh.hospital as hospitalName,
-            pbpa.phy_appont_time AS phyAppontTime,
+        pbpa.phy_appont_time AS phyAppontTime,
-            if_cancel AS ifCancel,
+        pbpa.if_cancel AS ifCancel,
-            pbpa.comb_name AS combName,
+        pbpa.comb_name AS combName,
-            sum( apc.meal_price ) AS setMealPrice,
+        sum( apc.meal_price ) AS setMealPrice,
-            pbpa.if_career_appoint AS setMealType
+        pbpa.if_career_appoint AS setMealType
         FROM
-            pm_base_phy_appont pbpa
+        pm_base_phy_appont pbpa
-            LEFT JOIN pm_base_hospital pbh ON pbpa.hospital_id = pbh.id
+        LEFT JOIN pm_base_hospital pbh ON pbpa.hospital_id = pbh.id
-            LEFT JOIN appont_phy_correlation apc ON apc.appont_id = pbpa.id
+        LEFT JOIN appont_phy_correlation apc ON apc.appont_id = pbpa.id
         WHERE
-            user_id = #{userId}
+        pbpa.user_id = #{userId}
+        <if test="ifCancel != null and ifCancel != ''">
+            and pbpa.if_cancel = #{ifCancel}
+        </if>
         GROUP BY
-            pbpa.id
+        pbpa.id
-            order by pbpa.phy_appont_time DESC
+        order by pbpa.phy_appont_time DESC
     </select>
     <select id="getapplogininfo" resultType="com.bonus.boot.manager.app.beans.PmBasePhysicalBean">
         SELECT