大屏修改

huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/ScreenTestController/ScreenAlarmCountByDayTest.java

@@ -38,8 +38,8 @@ public class ScreenAlarmCountByDayTest {
 
     //四种事件统计
     @RequestMapping("/CountByDay")
-    public R AlarmCountByDay(HttpServletRequest request, @RequestParam(name = "farmId") Integer farmId) throws ClientException {
-        if (1 == farmId) {
+    public R AlarmCountByDay(HttpServletRequest request, @RequestParam(name = "farmId") String farmId) throws ClientException {
+        if ("1".equals(farmId) ) {
             System.out.println("曙光");
             GetResponse getResponse = new GetResponse();
             SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -79,7 +79,7 @@ public class ScreenAlarmCountByDayTest {
             return R.ok("请求成功").put("data", result);
         }
 
-        if (21 == farmId) {
+        if ("21".equals(farmId) ) {
             System.out.println("苍南");
             GetResponse getResponse = new GetResponse();
             SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -119,7 +119,7 @@ public class ScreenAlarmCountByDayTest {
             return R.ok("请求成功").put("data", result);
         }
 
-        if (22 == farmId) {
+        if ("22".equals(farmId) ) {
             System.out.println("海宁");
             GetResponse getResponse = new GetResponse();
             SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/ScreenTestController/ScreenCarTestController.java

@@ -38,8 +38,8 @@ public class ScreenCarTestController {
      */
     // https://36.26.62.70:447/evo-apigw/ipms/carcapture/find/conditions?pageNum=1&pageSize=10&queryTimeBegin=2021-12-01+00%3A00%3A00&queryTimeEnd=2021-12-01+23%3A59%3A59&_=1638356246174
     @RequestMapping("/count_car_record")
-    public R ddgetCarRecord(HttpServletRequest request, @RequestParam(name = "farmId") Integer farmId) throws ClientException {
-
+    public R ddgetCarRecord(HttpServletRequest request, @RequestParam(name = "farmId") String farmId) throws ClientException {
+        System.out.println(farmId);
         GetResponse getResponse = new GetResponse();
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Calendar c = Calendar.getInstance();
@@ -83,7 +83,7 @@ public class ScreenCarTestController {
 
         List result = new ArrayList();
 
-        if (1 == farmId){
+        if ("1".equals(farmId)){
             Map map1 = new HashMap();
             map1.put("time", splitTime(B));
             map1.put("value", getResponse.carCount(formatB, formatA,null,oauthConfigBaseInfo));
@@ -126,7 +126,7 @@ public class ScreenCarTestController {
             return R.ok("请求成功").put("data", result);
         }
         //海宁
-        if (22 == farmId){
+        if ("22".equals(farmId)){
             Map map1 = new HashMap();
             map1.put("time", splitTime(B));
             map1.put("value", getResponse.carCount02(formatB, formatA,null,oauthConfigBaseInfo02));
@@ -169,7 +169,7 @@ public class ScreenCarTestController {
             return R.ok("请求成功").put("data", result);
         }
         //苍南
-        if (23 == farmId){
+        if ("21".equals(farmId)){
 
             Map map1 = new HashMap();
             map1.put("time", splitTime(B));

huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/ScreenTestController/ScreenIndexDataTestController.java

@@ -33,7 +33,8 @@ public class ScreenIndexDataTestController {
     private OauthConfigBaseInfo03 oauthConfigBaseInfo03;
     //返回大屏首页的数据
     @RequestMapping("/dataList")
-    public R indexDataList(HttpServletRequest request, @RequestParam(name = "farmId") Integer farmId) throws ClientException, ParseException {
+    public R indexDataList(HttpServletRequest request, @RequestParam(name = "farmId") String farmId) throws ClientException, ParseException {
+        System.out.println(farmId);
         GetResponse getResponse = new GetResponse();
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Map map = new HashMap<>();
@@ -57,7 +58,7 @@ public class ScreenIndexDataTestController {
         String formatC = format.format(C);
 
         System.out.println(formatA + formatB);
-        if (farmId ==1){
+        if ("1".equals(farmId)){
             //人员刷脸成功
             map.put("personPassSuccess", getResponse.SendMassageGetPagePersonAlarm(formatB, formatA,null,61,oauthConfigBaseInfo));
             //人员刷脸失败
@@ -82,7 +83,7 @@ public class ScreenIndexDataTestController {
             return R.ok("请求成功").put("data", map);
         }
         //海宁
-        if (farmId == 22){
+        if ("22".equals(farmId)){
             //人员刷脸成功
             map.put("personPassSuccess", getResponse.SendMassageGetPagePersonAlarm02(formatB, formatA,null,61,oauthConfigBaseInfo02));
             //人员刷脸失败
@@ -107,7 +108,7 @@ public class ScreenIndexDataTestController {
             return R.ok("请求成功").put("data", map);
         }
         //苍南
-        if (farmId == 21){
+        if ("21".equals(farmId)){
             //人员刷脸成功
             map.put("personPassSuccess", getResponse.SendMassageGetPagePersonAlarm(formatB, formatA,null,61,oauthConfigBaseInfo));
             //人员刷脸失败

huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/ScreenTestController/ScreenPersonTestController.java

@@ -28,7 +28,8 @@ public class ScreenPersonTestController {
     private OauthConfigBaseInfo03 oauthConfigBaseInfo03;
     //成功通行记录
     @RequestMapping("/count_person_record")
-    public R ddgetCarRecord(HttpServletRequest request, @RequestParam(name = "farmId") Integer farmId) throws ClientException, ParseException {
+    public R ddgetCarRecord(HttpServletRequest request, @RequestParam(name = "farmId") String farmId) throws ClientException, ParseException {
+        System.out.println(farmId);
         GetResponse getResponse = new GetResponse();
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Calendar c = Calendar.getInstance();
@@ -69,7 +70,7 @@ public class ScreenPersonTestController {
         Date H = c.getTime();
         String formatH = format.format(H);
 
-        if (farmId == 1) {
+        if ("1".equals(farmId)) {
             List result = new ArrayList();
 
             Map map1 = new HashMap();
@@ -112,7 +113,7 @@ public class ScreenPersonTestController {
             Collections.reverse(result);
             return R.ok("请求成功").put("data", result);
         }
-        if (farmId == 22) {
+        if ("22".equals(farmId)) {
             List result = new ArrayList();
 
             Map map1 = new HashMap();
@@ -156,7 +157,7 @@ public class ScreenPersonTestController {
             return R.ok("请求成功").put("data", result);
         }
 
-        if (farmId == 21) {
+        if ("21".equals(farmId)) {
             List result = new ArrayList();
 
             Map map1 = new HashMap();
@@ -208,12 +209,13 @@ public class ScreenPersonTestController {
 
     //人员正常通行与异常通行的数据
     @RequestMapping("/count_person_record_fail_success")
-    public R count_person_record_fail_success(HttpServletRequest request, @RequestParam(name = "farmId") Integer farmId) throws ClientException, ParseException {
+    public R count_person_record_fail_success(HttpServletRequest request, @RequestParam(name = "farmId") String farmId) throws ClientException, ParseException {
+        System.out.println(farmId);
 
-        if (farmId != 1) {
-            //返回为空数据
-            return R.ok("当前牧场无设备").put("data", null);
-        }
+//        if (""farmId != 1) {
+//            //返回为空数据
+//            return R.ok("当前牧场无设备").put("data", null);
+//        }
         GetResponse getResponse = new GetResponse();
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Calendar c = Calendar.getInstance();

huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/ScreenTestController/ScreenSiZhuTestController.java

@@ -51,7 +51,8 @@ public class ScreenSiZhuTestController {
      * @throws ParseException
      */
     @RequestMapping("/count_sizhu_record")
-    public R count_sizhu_record(HttpServletRequest request, @RequestParam(name = "farmId") Integer farmId) throws ClientException, ParseException {
+    public R count_sizhu_record(HttpServletRequest request, @RequestParam(name = "farmId") String farmId) throws ClientException, ParseException {
+        System.out.println(farmId);
         Map map1 = new HashMap();
         map1.put("value1", getPastSevenDay(farmId));
         map1.put("value2", getDay(farmId));
@@ -63,7 +64,8 @@ public class ScreenSiZhuTestController {
         return R.ok("当前牧场无设备").put("data", null);
     }
     @RequestMapping("/SiZhuList")
-    public R SiZhuList(HttpServletRequest request, @RequestParam(name = "farmId") Integer farmId) throws ClientException, ParseException {
+    public R SiZhuList(HttpServletRequest request, @RequestParam(name = "farmId") String farmId) throws ClientException, ParseException {
+        System.out.println(farmId);
         GeneralResponse siZhuList = getSiZhuList(farmId);
         if (ObjectUtil.isNotEmpty(siZhuList)){
             return R.ok("请求成功").put("data", siZhuList);
@@ -72,7 +74,7 @@ public class ScreenSiZhuTestController {
     }
 
     //过去七天的值
-    public String getPastSevenDay(Integer farmId) throws ClientException {
+    public String getPastSevenDay(String farmId) throws ClientException {
         GetResponse getResponse = new GetResponse();
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Calendar c = Calendar.getInstance();
@@ -87,13 +89,13 @@ public class ScreenSiZhuTestController {
         c.add(Calendar.DATE, -7);
         Date B = c.getTime();
         String formatB = format.format(B);
-        if (farmId == 1){
+        if ("1".equals(farmId)){
             return  getResponse.SendMassageXixiaoPerson(formatB, formatA,oauthConfigBaseInfo,CommonConstant.SIZhuChannle);
         }
-        if (farmId == 22){
+        if ("22".equals(farmId)){
             return  getResponse.SendMassageXixiaoPerson02(formatB, formatA,oauthConfigBaseInfo02,CommonConstant.SIZhuChannle);
         }
-        if (farmId == 21){
+        if ("21".equals(farmId)){
             return  getResponse.SendMassageXixiaoPerson03(formatB, formatA,oauthConfigBaseInfo03,CommonConstant.SIZhuChannle);
         }
         return "0";
@@ -102,7 +104,7 @@ public class ScreenSiZhuTestController {
 
 
     //今天的数据
-    public String getDay(Integer farmId) throws ClientException {
+    public String getDay(String farmId) throws ClientException {
         GetResponse getResponse = new GetResponse();
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Calendar c = Calendar.getInstance();
@@ -117,13 +119,13 @@ public class ScreenSiZhuTestController {
         c.add(Calendar.DATE, -1);
         Date B = c.getTime();
         String formatB = format.format(B);
-        if (farmId == 1){
+        if ("1".equals(farmId)){
             return  getResponse.SendMassageXixiaoPerson(formatB, formatA,oauthConfigBaseInfo,CommonConstant.SIZhuChannle);
         }
-        if (farmId == 22){
+        if ("22".equals(farmId)){
             return  getResponse.SendMassageXixiaoPerson02(formatB, formatA,oauthConfigBaseInfo02,CommonConstant.SIZhuChannle);
         }
-        if (farmId == 21){
+        if ("21".equals(farmId)){
             return  getResponse.SendMassageXixiaoPerson03(formatB, formatA,oauthConfigBaseInfo03,CommonConstant.SIZhuChannle);
         }
         return "0";
@@ -131,7 +133,7 @@ public class ScreenSiZhuTestController {
 
 
     //最新一条的数据
-    public String getLatestOne(Integer farmId)   {
+    public String getLatestOne(String farmId)   {
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Calendar c = Calendar.getInstance();
         Date date = new Date();
@@ -145,7 +147,7 @@ public class ScreenSiZhuTestController {
         Date d = c.getTime();
         String formatD = format.format(d);
         String result ="";
-        if (farmId == 1){
+        if ("1".equals(farmId)){
             System.out.println("曙光");
             XunZhengRequestSg requestSg = new XunZhengRequestSg(oauthConfigBaseInfo);
             requestSg.setPageNum(1);
@@ -155,7 +157,7 @@ public class ScreenSiZhuTestController {
             requestSg.setEventType(1);
             result = requestSg.doAction();
         }
-        if (farmId == 22){
+        if ("22".equals(farmId)){
             System.out.println("海宁");
             XunZhengRequestHn requestSg = new XunZhengRequestHn(oauthConfigBaseInfo02);
             requestSg.setPageNum(1);
@@ -165,7 +167,7 @@ public class ScreenSiZhuTestController {
             requestSg.setEventType(1);
             result = requestSg.doAction();
         }
-        if (farmId == 21){
+        if ("21".equals(farmId)){
             System.out.println("苍南");
             XunZhengRequestCn requestSg = new XunZhengRequestCn(oauthConfigBaseInfo03);
             requestSg.setPageNum(1);
@@ -193,7 +195,7 @@ public class ScreenSiZhuTestController {
 
 
     //返回所有的死猪事件
-    public GeneralResponse getSiZhuList(Integer farmId) throws ClientException {
+    public GeneralResponse getSiZhuList(String farmId) throws ClientException {
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Calendar c = Calendar.getInstance();
         Date date = new Date();
@@ -207,7 +209,7 @@ public class ScreenSiZhuTestController {
         Date d = c.getTime();
         String formatD = format.format(d);
         Map<String, Object> params = new HashMap<>();
-        if (farmId == 1){
+        if ("1".equals(farmId)){
             XunZhengRequestSg requestSg = new XunZhengRequestSg(oauthConfigBaseInfo);
             requestSg.setPageNum(1);
             requestSg.setPageSize(10);
@@ -217,7 +219,7 @@ public class ScreenSiZhuTestController {
             String result = requestSg.doAction();
             System.out.println(result);
         }
-        if (farmId == 22){
+        if ("22".equals(farmId)){
             XunZhengRequestHn requestSg = new XunZhengRequestHn(oauthConfigBaseInfo02);
             requestSg.setPageNum(1);
             requestSg.setPageSize(10);
@@ -227,7 +229,7 @@ public class ScreenSiZhuTestController {
             String result = requestSg.doAction();
             System.out.println(result);
         }
-        if (farmId == 21){
+        if ("21".equals(farmId)){
             XunZhengRequestCn requestSg = new XunZhengRequestCn(oauthConfigBaseInfo03);
             requestSg.setPageNum(1);
             requestSg.setPageSize(10);

huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/controller/ClientPersonManageControllerTest.java

@@ -8,6 +8,9 @@ import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo02;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo03;
 import com.huimv.video.dhicc.test.request.*;
+import com.huimv.video.dhicc.test.request.DepartmentRequest.Cn.DepartmentListRequestCn;
+import com.huimv.video.dhicc.test.request.DepartmentRequest.Hn.DepartmentListRequestHn;
+import com.huimv.video.dhicc.test.request.DepartmentRequest.Sg.DepartmentListRequestSg;
 import com.huimv.video.dhicc.test.request.Person.Cn.*;
 import com.huimv.video.dhicc.test.request.Person.Hn.*;
 import com.huimv.video.dhicc.test.request.Person.Sg.*;
@@ -445,4 +448,23 @@ public class ClientPersonManageControllerTest {
 
         return action;
     }
+    @RequestMapping("departmentList")
+    public R departmentList(@RequestBody Map<String,Integer> paramsMap) {
+        Integer farmId = paramsMap.get("farmId");
+        if (farmId == 1) {
+            System.out.println("曙光");
+            DepartmentListRequestSg departmentList = new DepartmentListRequestSg(oauthConfigBaseInfo);
+            return R.ok("请求成功").put("data", departmentList.doAction());
+        } else if (farmId == 22) {
+            System.out.println("海宁");
+            DepartmentListRequestHn departmentList = new DepartmentListRequestHn(oauthConfigBaseInfo02);
+            return R.ok("请求成功").put("data", departmentList.doAction());
+        } else if (farmId == 21) {
+            System.out.println("苍南");
+            DepartmentListRequestCn departmentList = new DepartmentListRequestCn(oauthConfigBaseInfo03);
+            return R.ok("请求成功").put("data", departmentList.doAction());
+        } else {
+            return R.error();
+        }
+    }
 }

huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/controller/ClientXunZhengControllerTest.java

@@ -34,7 +34,6 @@ public class ClientXunZhengControllerTest {
         if (farmId == 1){
             System.out.println("曙光");
             XunZhengRequestSg requestSg = new XunZhengRequestSg(oauthConfigBaseInfo);
-            Token token = requestSg.getToken();
             requestSg.setEventType(xunZhengRequestSg.getEventType());
             requestSg.setPageNum(xunZhengRequestSg.getPageNum());
             requestSg.setPageSize(xunZhengRequestSg.getPageSize());