詹子聪 5 лет назад
Родитель
Сommit
25a6cae466

+ 2 - 0
src/main/java/com/miekir/shibei/controller/api/CouponController.java

@@ -45,6 +45,7 @@ public class CouponController {
             dbCouponBean = couponRepository.findCouponById(couponBean.id);
             dbCouponBean = couponRepository.findCouponById(couponBean.id);
         } catch (Exception e) {
         } catch (Exception e) {
             e.printStackTrace();
             e.printStackTrace();
+            responseResult.setMessage("请重新登录");
         }
         }
 
 
         // 找不到对应商品,说明是新增
         // 找不到对应商品,说明是新增
@@ -87,6 +88,7 @@ public class CouponController {
             dbCouponBean = couponRepository.findCouponById(couponId);
             dbCouponBean = couponRepository.findCouponById(couponId);
         } catch (Exception e) {
         } catch (Exception e) {
             e.printStackTrace();
             e.printStackTrace();
+            responseResult.setMessage("请重新登录");
             return JSON.toJSONString(responseResult);
             return JSON.toJSONString(responseResult);
         }
         }
 
 

+ 8 - 6
src/main/java/com/miekir/shibei/controller/api/JsonController.java

@@ -108,7 +108,7 @@ public class JsonController {
     @RequestMapping(value = "/api/saveJson", method = RequestMethod.POST, produces = "application/json; charset=utf-8")
     @RequestMapping(value = "/api/saveJson", method = RequestMethod.POST, produces = "application/json; charset=utf-8")
     @ResponseBody
     @ResponseBody
     public String saveJson(@RequestHeader HttpHeaders header, @RequestBody JsonBean jsonBean) {
     public String saveJson(@RequestHeader HttpHeaders header, @RequestBody JsonBean jsonBean) {
-        ResponseResult<String> responseResult = new ResponseResult<String>();
+        ResponseResult<JsonBean> responseResult = new ResponseResult<JsonBean>();
         responseResult.setMessage("操作失败");
         responseResult.setMessage("操作失败");
 
 
         String email = header.getFirst("email");
         String email = header.getFirst("email");
@@ -127,14 +127,15 @@ public class JsonController {
             return JSON.toJSONString(responseResult);
             return JSON.toJSONString(responseResult);
         }
         }
 
 
+        JsonBean dbJsonBean = null;
         try {
         try {
-            jsonRepository.save(jsonBean);
+            dbJsonBean = jsonRepository.save(jsonBean);
         } catch (Exception e) {
         } catch (Exception e) {
             e.printStackTrace();
             e.printStackTrace();
             return JSON.toJSONString(responseResult);
             return JSON.toJSONString(responseResult);
         }
         }
 
 
-        responseResult.setContent("操作成功");
+        responseResult.setContent(dbJsonBean);
         responseResult.setCode(ResultCode.SUCCESS);
         responseResult.setCode(ResultCode.SUCCESS);
         responseResult.setMessage("操作成功");
         responseResult.setMessage("操作成功");
         return JSON.toJSONString(responseResult);
         return JSON.toJSONString(responseResult);
@@ -162,12 +163,13 @@ public class JsonController {
 
 
         // 用户token不一致
         // 用户token不一致
         if (dbUserBean == null || !TextUtils.equals(token, dbUserBean.getToken())) {
         if (dbUserBean == null || !TextUtils.equals(token, dbUserBean.getToken())) {
+            responseResult.setMessage("请重新登录");
             return JSON.toJSONString(responseResult);
             return JSON.toJSONString(responseResult);
         }
         }
 
 
         JsonBean jsonBean = null;
         JsonBean jsonBean = null;
         try {
         try {
-            jsonBean = jsonRepository.findCouponByEmail(email);
+            jsonBean = jsonRepository.findJsonBeanByEmail(email);
         } catch (Exception e) {
         } catch (Exception e) {
             e.printStackTrace();
             e.printStackTrace();
         }
         }
@@ -187,10 +189,10 @@ public class JsonController {
     public String getJson(String email) {
     public String getJson(String email) {
         JsonBean jsonBean = null;
         JsonBean jsonBean = null;
         try {
         try {
-            jsonBean = jsonRepository.findCouponByEmail(email);
+            jsonBean = jsonRepository.findJsonBeanByEmail(email);
         } catch (Exception e) {
         } catch (Exception e) {
             e.printStackTrace();
             e.printStackTrace();
-            return "";
+            return "数据库数据重复";
         }
         }
         return jsonBean.json;
         return jsonBean.json;
     }
     }

+ 1 - 1
src/main/java/com/miekir/shibei/controller/api/SystemController.java

@@ -94,7 +94,7 @@ public class SystemController {
 
 
         WuUpgrade upgradeInfo;
         WuUpgrade upgradeInfo;
         try {
         try {
-            upgradeInfo = upgradeRepository.findUpgradeInfoById(0);
+            upgradeInfo = upgradeRepository.findUpgradeInfoById();
         } catch (Exception e) {
         } catch (Exception e) {
             e.printStackTrace();
             e.printStackTrace();
             return JSON.toJSONString(responseResult);
             return JSON.toJSONString(responseResult);

+ 4 - 4
src/main/java/com/miekir/shibei/repository/JsonRepository.java

@@ -13,8 +13,8 @@ import org.springframework.transaction.annotation.Transactional;
  */
  */
 @Repository
 @Repository
 public interface JsonRepository extends JpaRepository<JsonBean, Integer> {
 public interface JsonRepository extends JpaRepository<JsonBean, Integer> {
-    // 根据Email查找对应的Json
-    @Transactional
-    @Query(value="select jsonBean from JsonBean jsonBean where jsonBean.email=:email")
-    public JsonBean findCouponByEmail(@Param("email") String email);
+    // 根据Email查找对应的Json 选择第一条
+    // 使用原生SQL MYSQL 不支持TOP
+    @Query(value="SELECT * FROM t_json where email = ?1 limit 1", nativeQuery = true)
+    public JsonBean findJsonBeanByEmail(String email);
 }
 }

+ 4 - 5
src/main/java/com/miekir/shibei/repository/UpgradeRepository.java

@@ -13,10 +13,9 @@ import org.springframework.transaction.annotation.Transactional;
 // 添加注解
 // 添加注解
 @Repository
 @Repository
 public interface UpgradeRepository extends JpaRepository<WuUpgrade, Integer> {
 public interface UpgradeRepository extends JpaRepository<WuUpgrade, Integer> {
-    // 根据密码Id查询密码记事
-    // 说明该方法是事务性操作
+    // 使用原生SQL语句查找最新一条记录
     @Transactional
     @Transactional
-    // @Param注解用于提取参数
-    @Query(value="select upgradeInfo from WuUpgrade upgradeInfo where upgradeInfo.id=:id")
-    public WuUpgrade findUpgradeInfoById(@Param("id") Integer id);
+
+    @Query(value = "SELECT * FROM t_upgrade ORDER BY id DESC LIMIT 1", nativeQuery=true)
+    public WuUpgrade findUpgradeInfoById();
 }
 }

+ 1 - 1
src/main/java/com/miekir/shibei/repository/UserRepository.java

@@ -16,7 +16,7 @@ import java.util.List;
 // 添加注解
 // 添加注解
 @Repository
 @Repository
 public interface UserRepository extends JpaRepository<User, String> {
 public interface UserRepository extends JpaRepository<User, String> {
-    /*// 说明该方法是修改操作
+    /*// 说明该方法是修改操作 JPQL
     @Modifying
     @Modifying
     // 说明该方法是事务性操作
     // 说明该方法是事务性操作
     @Transactional
     @Transactional