更新

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/PlanTaskController.java

@@ -41,6 +41,7 @@ import org.springframework.web.context.request.RequestContextHolder;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -1082,15 +1083,15 @@ public class PlanTaskController extends AbstractBaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "idx消防巡查报表调用", notes = "idx消防巡查报表调用")
     @RequestMapping(value = "/report/info", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
-    public CommonResponse getPlanTaskInfoList(@ApiParam(value = "站编码") @RequestParam(required = false) String bizOrgCode,
-            @ApiParam(value = "开始日期") @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date startDate,
-            @ApiParam(value = "结束日期") @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endDate) {
+    public ResponseModel getPlanTaskInfoList(@ApiParam(value = "站编码") @RequestParam(required = false) String bizOrgCode,
+                                             @ApiParam(value = "开始日期") @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date startDate,
+                                             @ApiParam(value = "结束日期") @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endDate) {
         try {
             Map<String, Object> map = planTaskService.queryPatrolInfoList(bizOrgCode, startDate, endDate);
-            return CommonResponseUtil.success(map);
+            return CommonPatrolResponseUtil.success(map);
         } catch (Exception e) {
             log.error(e.getMessage(), e);
-            return CommonResponseUtil.failure("远程查询巡检信息失败！");
+            return CommonPatrolResponseUtil.failure("远程查询巡检信息失败！");
         }
     }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/util/CommonPatrolResponseUtil.java

+package com.yeejoin.amos.patrol.business.util;
+
+import org.springframework.http.HttpStatus;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+
+public class CommonPatrolResponseUtil
+{
+	private CommonPatrolResponseUtil() {
+	}
+
+	public static ResponseModel success()
+	{	
+		ResponseModel res = new ResponseModel<>();
+        res.setDevMessage(Constant.RESULT_SUCCESS);
+        res.setStatus(HttpStatus.OK.value());
+		return res;
+	}
+
+	public static ResponseModel success(Object obj)
+	{	
+		ResponseModel<Object> res = new ResponseModel<>();
+        res.setResult(obj);
+        res.setDevMessage(Constant.RESULT_SUCCESS);
+        res.setStatus(HttpStatus.OK.value());
+		return res;
+	}
+
+	public static ResponseModel success(Object obj, String message)
+	{	
+		ResponseModel res = new ResponseModel<>();
+        res.setResult(obj);
+        res.setDevMessage(message);
+        res.setStatus(HttpStatus.OK.value());
+		return res;
+	}
+
+	public static ResponseModel failure()
+	{	
+		ResponseModel res = new ResponseModel<>();
+        res.setDevMessage(Constant.RESULT_FAILURE);
+        res.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value());
+		return res;
+	}
+
+	public static ResponseModel failure(String message)
+	{
+		ResponseModel res = new ResponseModel<>();
+        res.setDevMessage(Constant.RESULT_FAILURE);
+        res.setMessage(message);
+        res.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value());
+		return res;
+	}
+
+	public static ResponseModel failure(Object obj, String message)
+	{
+		ResponseModel res = new ResponseModel<>();
+        res.setResult(obj);
+		res.setMessage(message);
+        res.setDevMessage(Constant.RESULT_FAILURE);
+        res.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value());
+		return res;
+	}
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/util/Constant.java

+package com.yeejoin.amos.patrol.business.util;
+
+/**
+ * @Description: 常量类
+ * @Author: duanwei
+ * @Date: 2019/7/29
+ */
+public interface Constant {
+
+
+
+
+    String RESULT_SUCCESS = "SUCCESS";
+
+    String RESULT_FAILURE = "FAILURE";
+    /**
+     * 请求成功
+     */
+    String SUCCESS = "200";
+
+    String NULL = "";
+    
+    
+    /**
+     * 数字换流站大小屏数据编码
+     * //fireResources(资源概率);fireCAFSSys（CAFS系统）；fireAlarmSys（火灾报警系统）；
+     * fireONLSys（排油系统）；fireFoamSys（泡沫灭火系统）；
+     * fireWaterSys（消防给水系统）；fireFoamMistSys（细水雾涡扇炮系统）
+     */
+
+
+    String threeBigTopicfireResources = "threeBigTopicfireResources";
+    
+    String threeSmallTopicfireResources = "threeSmallTopicfireResources";
+    
+    String fourBigTopicfireResources = "fourBigTopicfireResources";
+    
+    String fourSmallTopicfireResources = "fourSmallTopicfireResources";
+    
+    
+    String threeBigTopicfireCAFSSys = "threeBigTopicfireCAFSSys";
+    
+    String threeSmallTopicfireCAFSSys = "threeSmallTopicfireCAFSSys";
+    
+    String fourSmallTopicfireCAFSSys = "fourSmallTopicfireCAFSSys";
+
+    
+    String threeBigTopicfireAlarmSys = "threeBigTopicfireAlarmSys";
+    
+    String threeSmallTopicfireAlarmSys = "threeSmallTopicfireAlarmSys";
+    
+    String fourSmallTopicfireAlarmSys = "fourSmallTopicfireAlarmSys";
+    
+    
+    String threeBigTopicfireONLSys = "threeBigTopicfireONLSys";
+    
+    String threeSmallTopicfireONLSys = "threeSmallTopicfireONLSys";
+    
+    String fourSmallTopicfireONLSys = "fourSmallTopicfireONLSys";
+
+    
+    String threeBigTopicfireFoamSys = "threeBigTopicfireFoamSys";
+    
+    String threeSmallTopicfireFoamSys = "threeSmallTopicfireFoamSys";
+    
+    String fourSmallTopicfireFoamSys = "fourSmallTopicfireFoamSys";
+
+    
+    String threeBigTopicfireWaterSys = "threeBigTopicfireWaterSys";
+    
+    String threeSmallTopicfireWaterSys = "threeSmallTopicfireWaterSys";
+    
+    String fourSmallTopicfireWaterSys = "fourSmallTopicfireWaterSys";
+
+    
+    String threeBigTopicfireFoamMistSys = "threeBigTopicfireFoamMistSys";
+    
+    String threeSmallTopicfireFoamMistSys = "threeSmallTopicfireFoamMistSys";
+    
+    String fourSmallTopicfireFoamMistSys = "fourSmallTopicfireFoamMistSys";
+    
+    
+
+
+}