Merge branch 'dev_upgrade_rule' into dev_upgrade

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/ContingencyAction.java

@@ -11,29 +11,28 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.yeejoin.amos.fas.business.feign.IDutyModeServer;
-import com.yeejoin.amos.fas.business.util.HttpUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.yeejoin.amos.fas.business.action.result.ActionResult;
 import com.yeejoin.amos.fas.business.action.result.BubbleTipResult;
 import com.yeejoin.amos.fas.business.action.result.message.ActionResultMessage;
+import com.yeejoin.amos.fas.business.feign.IDutyModeServer;
 import com.yeejoin.amos.fas.business.service.impl.RuleRunigSnapshotServiceImpl;
 import com.yeejoin.amos.fas.business.service.intfc.FireStengthService;
 import com.yeejoin.amos.fas.business.service.intfc.IContingencyInstance;
 import com.yeejoin.amos.fas.business.service.intfc.IRiskSourceService;
 import com.yeejoin.amos.fas.business.service.model.ContingencyDeviceStatus;
 import com.yeejoin.amos.fas.business.service.model.ContingencyRo;
-import com.yeejoin.amos.fas.business.util.StringUtil;
+import com.yeejoin.amos.fas.business.util.HttpUtil;
 import com.yeejoin.amos.fas.dao.entity.ContingencyPlanInstance;
-import org.springframework.util.ObjectUtils;
 
 @Component
 public class ContingencyAction implements CustomerAction {

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/FireStationController.java

@@ -111,6 +111,7 @@ public class FireStationController extends BaseController {
 		return CommonResponseUtil.success(iFireStationService.delete(idArray));
 	}
 
+	@Permission
 	@ApiOperation(httpMethod = "GET", value = "分页查询消防小室", notes = "分页查询消防小室")
 	@RequestMapping(value = "/page", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
 	public CommonResponse forPage(

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/TimeLineController.java

@@ -73,7 +73,7 @@ public class TimeLineController extends BaseController{
 
 
     @Scheduled(cron = "*/2 * * * * ?")
-    private void runFireQueue()  throws Exception
+    public void runFireQueue()  throws Exception
     {
 
         if(fireQueue.size() == 0)