Browse Source

修改绑定公众号接口

liu 2 years atrás
parent
commit
4a1bbbf2a2

+ 19 - 2
.idea/workspace.xml

@@ -6,7 +6,10 @@
   <component name="ChangeListManager">
     <list default="true" id="36922be1-416a-4a25-9739-9814e01883a6" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartWarningServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartWarningServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/api/SmartWarningControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/api/SmartWarningControllerAPI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/common/utils/GetCameraPreviewURL.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/common/utils/GetCameraPreviewURL.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/common/utils/SendSms.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/common/utils/SendSms.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartWarningController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartWarningController.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -248,7 +251,20 @@
   <component name="RebelAgentSelection">
     <selection>jr</selection>
   </component>
-  <component name="RunManager" selected="Spring Boot.MybatisPlusApplication">
+  <component name="RunManager" selected="Application.GetCameraPreviewURL">
+    <configuration name="GetCameraPreviewURL" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="com.template.common.utils.GetCameraPreviewURL" />
+      <module name="mybatis_plus" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="com.template.common.utils.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
     <configuration name="SendSms" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="com.template.common.utils.SendSms" />
       <module name="mybatis_plus" />
@@ -271,6 +287,7 @@
     </configuration>
     <recent_temporary>
       <list>
+        <item itemvalue="Application.GetCameraPreviewURL" />
         <item itemvalue="Application.SendSms" />
       </list>
     </recent_temporary>

+ 3 - 0
src/main/java/com/template/api/SmartWarningControllerAPI.java

@@ -76,5 +76,8 @@ public interface SmartWarningControllerAPI {
     @ApiOperation(value = "删除预警可推送用户", notes = "删除预警可推送用户", httpMethod = "POST")
     CommonResult warningDeletePush(@RequestBody WarningDeletePushDto warningDeletePushDto);
 
+    @GetMapping(value = "/behaviour")
+    @ApiOperation(value = "行为分析", notes = "行为分析", httpMethod = "GET")
+    CommonResult behaviourList();
 
 }

+ 2 - 2
src/main/java/com/template/common/utils/GetCameraPreviewURL.java

@@ -87,9 +87,9 @@ public class GetCameraPreviewURL {
 
 //        区域入侵,进入区域,离开区域,倒地
         int[] ingArr=new int[]{131588,131586,131587,131605};
-        String url = "http://192.168.161.224:8080/wanzai/eventRcv/subscription";
+//        String url = "http://192.168.161.224:8080/wanzai/eventRcv/subscription";
 //        String url = "https://www.campussmartlife.com/smartApi/wanzai/eventRcv/subscription";
-//        String url = "http://122.51.35.116:8080/wanzai/eventRcv/subscription";
+        String url = "http://122.51.35.116:8080/wanzai/eventRcv/subscription";
 
 //        重点人员识别事件
 //        int[] ingArr = new int[]{1644175361};

+ 1 - 1
src/main/java/com/template/common/utils/SendSms.java

@@ -44,7 +44,7 @@ public class SendSms {
 
     //模板Id
 //    private static String templateId="1770016";
-    private static String templateId = "2060673";
+    private static String templateId = "2065770";
 
     //验证码有效时长
     private static String smsMin = "1";

+ 7 - 0
src/main/java/com/template/controller/SmartWarningController.java

@@ -355,6 +355,13 @@ public class SmartWarningController implements SmartWarningControllerAPI {
         return CommonResult.fail("删除失败");
     }
 
+    @Override
+    public CommonResult behaviourList() {
+
+
+        return null;
+    }
+
 
     /**
      * 根据父级ID获取树形数据

+ 1 - 1
src/main/java/com/template/controller/WxGzhController.java

@@ -99,7 +99,7 @@ public class WxGzhController implements WxGzhControllerAPI {
         queryWrapper1.ge("expiration_time", new Date());
         List<SmsCode> listc = smsCodeService.getSmsCodeByKey(queryWrapper1);
         if (listc.isEmpty()) {
-            return CommonResult.ok("验证码已失效");
+            return CommonResult.fail("验证码已失效");
         }
 
         for (SmsCode smsCode : listc) {