升级最新平台

YeeAmosFireAutoSysCommon/pom.xml

@@ -16,11 +16,11 @@
 		<version>1.0.0</version>
 	</parent>
 
-	<dependencies>
+	<!-- <dependencies>
 		<dependency>
 			<groupId>com.yeejoin.amos</groupId>
 			<artifactId>AmosOPService</artifactId>
 			<version>${YeeOp.version}</version>
 		</dependency>
-	</dependencies>
+	</dependencies> -->
 </project>
\ No newline at end of file

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/core/common/request/CommonPageable.java

@@ -62,7 +62,7 @@ public class CommonPageable implements Pageable {
 		return pageSize;
 	}
 
-	public int getOffset() {
+	public long getOffset() {
 		offset = pageSize * pageNumber;
 		return offset;
 	}

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/BasicEntity.java

@@ -13,7 +13,6 @@ import javax.persistence.MappedSuperclass;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
-import com.yeejoin.amos.op.core.entity.Resource;
 
 /**
  * <pre>
@@ -25,7 +24,7 @@ import com.yeejoin.amos.op.core.entity.Resource;
 @MappedSuperclass
 
 @EntityListeners(AuditingEntityListener.class) 
-public class BasicEntity extends Resource implements Serializable{
+public class BasicEntity /*extends Resource*/ implements Serializable{
 
 	private static final long serialVersionUID = -5464322936854328207L;
 	

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/BusinessEntity.java

+package com.yeejoin.amos.fas.dao.entity;
+
+
+import java.io.Serializable;
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.EntityListeners;
+import javax.persistence.MappedSuperclass;
+
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+
+/**
+ * 
+ * <pre>
+ * 涓氬姟瀹炰綋鎶借薄绫�
+ * </pre>
+ *
+ * @author as-guowubin
+ * @version $Id: BusinessEntity.java, v 0.1 2018骞�5鏈�18鏃� 涓嬪崍2:27:17 as-guowubin Exp $
+ */
+@MappedSuperclass
+@EntityListeners(value=AuditingEntityListener.class)
+public abstract class BusinessEntity  implements Serializable
+{
+	/**
+	 * <pre>
+	 * 
+	 * </pre>
+	 */
+	private static final long serialVersionUID = 1L;
+	/**
+	 * 鍒涘缓鏃堕棿
+	 */
+	@Column(name = "create_date",updatable = false)
+	private Date createDate;
+	/**
+	 * 鍒涘缓鐢ㄦ埛
+	 */
+	@Column(name = "create_user",updatable = false)
+	private String createUser;
+	/**
+	 * 鏇存柊鏃堕棿
+	 */
+	@Column(name = "update_date")
+	private Date updateDate;
+	/**
+	 * 鏇存柊鐢ㄦ埛
+	 */
+	@Column(name = "update_user")
+	private String updateUser;
+	/**
+	 * 鏄惁鍒犻櫎
+	 */
+	@Column(name = "is_delete")
+	private Boolean isDelete = false;
+
+	public Date getCreateDate()
+	{
+		return createDate;
+	}
+
+	public void setCreateDate(Date createDate)
+	{
+		this.createDate = createDate;
+	}
+
+	public String getCreateUser()
+	{
+		return createUser;
+	}
+
+	public void setCreateUser(String createUser)
+	{
+		this.createUser = createUser;
+	}
+
+	public Date getUpdateDate()
+	{
+		return updateDate;
+	}
+
+	public void setUpdateDate(Date updateDate)
+	{
+		this.updateDate = updateDate;
+	}
+
+	public String getUpdateUser()
+	{
+		return updateUser;
+	}
+
+	public void setUpdateUser(String updateUser)
+	{
+		this.updateUser = updateUser;
+	}
+
+	public Boolean getIsDelete()
+	{
+		return isDelete;
+	}
+
+	public void setIsDelete(Boolean isDelete)
+	{
+		this.isDelete = isDelete;
+	}
+
+}
+

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/ContingencyOriginalData.java

 package com.yeejoin.amos.fas.dao.entity;
 
-import com.yeejoin.amos.op.core.entity.BusinessEntity;
 import org.hibernate.annotations.GenericGenerator;
 
 import javax.persistence.*;

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/ContingencyPlanInstance.java

 package com.yeejoin.amos.fas.dao.entity;
 
 
-import com.yeejoin.amos.op.core.entity.BusinessEntity;
 import org.hibernate.annotations.GenericGenerator;
 
 import javax.persistence.*;

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/Equipment.java

@@ -20,6 +20,8 @@ public class Equipment extends BasicEntity  {
 
 	private String building;
 	
+	
+	
 	/**
 	 * 所属风险区域id
 	 */
@@ -102,7 +104,7 @@ public class Equipment extends BasicEntity  {
 	
 
 	@Column(name="create_by")
-	private int createBy;
+	private String createBy;
 
 	private String name;
 
@@ -162,11 +164,11 @@ public class Equipment extends BasicEntity  {
 		this.code = code;
 	}
 
-	public int getCreateBy() {
+	public String getCreateBy() {
 		return this.createBy;
 	}
 
-	public void setCreateBy(int createBy) {
+	public void setCreateBy(String createBy) {
 		this.createBy = createBy;
 	}
 

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/FireCar.java

@@ -23,7 +23,7 @@ public class FireCar extends BasicEntity  {
 	private String country;
 
 	@Column(name="create_by")
-	private int createBy;
+	private String createBy;
 
 	@Column(name="engine_num")
 	private String engineNum;
@@ -95,11 +95,11 @@ public class FireCar extends BasicEntity  {
 		this.country = country;
 	}
 
-	public int getCreateBy() {
+	public String getCreateBy() {
 		return this.createBy;
 	}
 
-	public void setCreateBy(int createBy) {
+	public void setCreateBy(String createBy) {
 		this.createBy = createBy;
 	}
 

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/FireEquipment.java

@@ -37,7 +37,7 @@ public class FireEquipment extends BasicEntity  {
 	private Boolean isIndoor;
 
 	@Column(name="create_by")
-	private int createBy;
+	private String createBy;
 
 	@Temporal(TemporalType.DATE)
 	@Column(name="effective_date")
@@ -181,11 +181,11 @@ public class FireEquipment extends BasicEntity  {
 		this.code = code;
 	}
 
-	public int getCreateBy() {
+	public String getCreateBy() {
 		return this.createBy;
 	}
 
-	public void setCreateBy(int createBy) {
+	public void setCreateBy(String createBy) {
 		this.createBy = createBy;
 	}
 

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/FireEquipmentPoint.java

@@ -21,7 +21,7 @@ public class FireEquipmentPoint extends BasicEntity  {
 	private String code;
 
 	@Column(name="create_by")
-	private Long createBy;
+	private String createBy;
 
 	@Column(name="fire_equipment_id")
 	private Long fireEquipmentId;
@@ -50,11 +50,11 @@ public class FireEquipmentPoint extends BasicEntity  {
 		this.code = code;
 	}
 
-	public Long getCreateBy() {
+	public String getCreateBy() {
 		return createBy;
 	}
 
-	public void setCreateBy(Long createBy) {
+	public void setCreateBy(String createBy) {
 		this.createBy = createBy;
 	}
 

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/Fmea.java

@@ -23,7 +23,7 @@ public class Fmea extends BasicEntity {
     private static final long serialVersionUID = 1L;
 
     @Column(name = "create_by")
-    private int createBy;
+    private String createBy;
 
     @Lob
     private String disposal;
@@ -79,16 +79,16 @@ public class Fmea extends BasicEntity {
     private RiskSource riskSource;
 
     @Column(name = "company_leader")
-    private Long companyLeader;
+    private String companyLeader;
 
     @Column(name = "department_leader")
-    private Long departmentLeader;
+    private String departmentLeader;
 
     @Column(name = "group_leader")
-    private Long groupLeader;
+    private String groupLeader;
 
     @Column(name = "person_leader")
-    private Long personLeader;
+    private String personLeader;
 
     @Column(name = "identify_user")
     private Integer identifyUser;
@@ -99,11 +99,11 @@ public class Fmea extends BasicEntity {
     public Fmea() {
     }
 
-    public int getCreateBy() {
+    public String getCreateBy() {
         return this.createBy;
     }
 
-    public void setCreateBy(int createBy) {
+    public void setCreateBy(String createBy) {
         this.createBy = createBy;
     }
 
@@ -266,35 +266,35 @@ public class Fmea extends BasicEntity {
         this.rpn = rpn;
     }
 
-    public Long getCompanyLeader() {
+    public String getCompanyLeader() {
         return companyLeader;
     }
 
-    public void setCompanyLeader(Long companyLeader) {
+    public void setCompanyLeader(String companyLeader) {
         this.companyLeader = companyLeader;
     }
 
-    public Long getDepartmentLeader() {
+    public String getDepartmentLeader() {
         return departmentLeader;
     }
 
-    public void setDepartmentLeader(Long departmentLeader) {
+    public void setDepartmentLeader(String departmentLeader) {
         this.departmentLeader = departmentLeader;
     }
 
-    public Long getGroupLeader() {
+    public String getGroupLeader() {
         return groupLeader;
     }
 
-    public void setGroupLeader(Long groupLeader) {
+    public void setGroupLeader(String groupLeader) {
         this.groupLeader = groupLeader;
     }
 
-    public Long getPersonLeader() {
+    public String getPersonLeader() {
         return personLeader;
     }
 
-    public void setPersonLeader(Long personLeader) {
+    public void setPersonLeader(String personLeader) {
         this.personLeader = personLeader;
     }
 

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/NodeMessageView.java

 package com.yeejoin.amos.fas.dao.entity;
 
 
-import com.yeejoin.amos.op.core.util.DateUtil;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+
+import com.yeejoin.amos.fas.core.common.request.DateUtil;
+
 import java.io.Serializable;
 import java.util.Date;
 

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/PPoint.java

@@ -92,10 +92,10 @@ public class PPoint extends BasicEntity  {
 	 private Boolean   isDelete  ;// '是否删除：0表示未删除，1表示已删除',
 
 	@Column(name="charge_dept_id")
-	 private Integer   chargeDeptId ;// '责任部门id',
+	 private String   chargeDeptId ;// '责任部门id',
 
 	@Column(name="charge_person_id")
-	 private Long   chargePersonId  ;// '负责人id',
+	 private String   chargePersonId  ;// '负责人id',
 
 	@Column(name="status")
 	 private String   status  ;// '状态：0 未纳入巡检，1 合格；2 不合格；3 漏检',
@@ -310,19 +310,19 @@ public class PPoint extends BasicEntity  {
 		isDelete = delete;
 	}
 
-	public Integer getChargeDeptId() {
+	public String getChargeDeptId() {
 		return chargeDeptId;
 	}
 
-	public void setChargeDeptId(Integer chargeDeptId) {
+	public void setChargeDeptId(String chargeDeptId) {
 		this.chargeDeptId = chargeDeptId;
 	}
 
-	public Long getChargePersonId() {
+	public String getChargePersonId() {
 		return chargePersonId;
 	}
 
-	public void setChargePersonId(Long chargePersonId) {
+	public void setChargePersonId(String chargePersonId) {
 		this.chargePersonId = chargePersonId;
 	}
 

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/SCompany.java

-package com.yeejoin.amos.fas.dao.entity;
+/*package com.yeejoin.amos.fas.dao.entity;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -11,9 +11,9 @@ import java.io.Serializable;
 import java.util.Date;
 
 
-/**
+*//**
  * The persistent class for the s_company database table.
- */
+ *//*
 @Entity
 @Table(name = "s_company")
 @NamedQuery(name = "SCompany.findAll", query = "SELECT s FROM SCompany s")
@@ -247,4 +247,4 @@ public class SCompany implements Serializable {
         this.updateUser = updateUser;
     }
 
-}
+}*/
\ No newline at end of file

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/SDepartment.java

-package com.yeejoin.amos.fas.dao.entity;
+/*package com.yeejoin.amos.fas.dao.entity;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -11,9 +11,9 @@ import java.io.Serializable;
 import java.util.Date;
 
 
-/**
+*//**
  * The persistent class for the s_department database table.
- */
+ *//*
 @Entity
 @Table(name = "s_department")
 @NamedQuery(name = "SDepartment.findAll", query = "SELECT s FROM SDepartment s")
@@ -145,4 +145,4 @@ public class SDepartment implements Serializable {
         this.updateUser = updateUser;
     }
 
-}
+}*/
\ No newline at end of file

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/SUser.java

-package com.yeejoin.amos.fas.dao.entity;
+/*package com.yeejoin.amos.fas.dao.entity;
 
 import org.hibernate.annotations.Where;
 
@@ -13,9 +13,9 @@ import java.io.Serializable;
 import java.util.Date;
 
 
-/**
+*//**
  * The persistent class for the s_user database table.
- */
+ *//*
 @Entity
 @Table(name = "s_user")
 @NamedQuery(name = "SUser.findAll", query = "SELECT s FROM SUser s")
@@ -256,4 +256,4 @@ public class SUser implements Serializable {
         this.userName = userName;
     }
 
-}
+}*/
\ No newline at end of file

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/TopographyLine.java

@@ -8,7 +8,6 @@ import javax.persistence.Table;
 
 import org.hibernate.annotations.GenericGenerator;
 
-import com.yeejoin.amos.op.core.entity.BusinessEntity;
 
 /**
  * 拓扑图连线

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/TopographyNode.java

@@ -8,7 +8,6 @@ import javax.persistence.Table;
 
 import org.hibernate.annotations.GenericGenerator;
 
-import com.yeejoin.amos.op.core.entity.BusinessEntity;
 
 /**
  * 拓扑图

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/TopographyNodeDetail.java

@@ -5,11 +5,7 @@ import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.Table;
-
 import org.hibernate.annotations.GenericGenerator;
-
-import com.yeejoin.amos.op.core.entity.BusinessEntity;
-
 /**
  * 拓扑图-节点详情
  *

YeeAmosFireAutoSysService/pom.xml

@@ -23,6 +23,12 @@
             <artifactId>YeeAmosFireAutoSysCommon</artifactId>
             <version>1.0.0</version>
         </dependency>
+        
+      <dependency>
+    <groupId>org.jsoup</groupId>
+    <artifactId>jsoup</artifactId>
+    <version>1.8.3</version>
+     </dependency>
        <!--  <dependency>
             <groupId>com.yeejoin.amos</groupId>
             <artifactId>YeeAMOSPatrolCommon</artifactId>
@@ -42,7 +48,7 @@
 <!--			<version>${YeeOp.version}</version>-->
 <!--		</dependency>-->
 
-		<dependency>
+		<!-- <dependency>
 			<groupId>org.typroject</groupId>
 			<artifactId>tyboot-component-cache</artifactId>
 			<version>1.1.13-Ty</version>
@@ -56,15 +62,37 @@
 					<artifactId>spring-boot-starter-data-redis</artifactId>
 				</exclusion>
 			</exclusions>
-		</dependency>
+		</dependency> -->
 
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-redis</artifactId>
 			<version>1.4.5.RELEASE</version>
 		</dependency>
+           <!-- 平台接口 -->
+	 <dependency>
+	  <groupId>com.yeejoin</groupId>
+	  <artifactId>amos-feign-privilege</artifactId>
+	  <version>1.1.0-SNAPSHOT</version>	  
+     </dependency>
+    <dependency>
+	  <groupId>com.yeejoin</groupId>
+	  <artifactId>amos-feign-systemctl</artifactId>
+	  <version>1.1.0-SNAPSHOT</version>
+     </dependency>
      
      <dependency>
+	  <groupId>com.yeejoin</groupId>
+	  <artifactId>amos-component-feign</artifactId>
+	  <version>1.1.0-SNAPSHOT</version>
+     </dependency>
+      
+
+
+
+
+
+		<!-- <dependency>
 			<groupId>com.yeejoin.amos</groupId>
 			<artifactId>amos-authtoken</artifactId>
 			<version>${YeeSecurity.version}</version>
@@ -78,7 +106,7 @@
 					<artifactId>spring-security-config</artifactId>
 				</exclusion>
 			</exclusions>
-		</dependency>
+		</dependency> -->
 		<dependency>
 			<groupId>cn.afterturn</groupId>
 			<artifactId>easypoi-base</artifactId>

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

@@ -15,12 +15,13 @@ import org.springframework.web.bind.annotation.RestController;
 import com.yeejoin.amos.fas.business.param.CommonPageInfoParam;
 import com.yeejoin.amos.fas.business.service.intfc.IAccidentTypeService;
 import com.yeejoin.amos.fas.business.util.CommonPageParamUtil;
+import com.yeejoin.amos.fas.business.vo.ReginParams;
 import com.yeejoin.amos.fas.core.common.request.CommonPageable;
 import com.yeejoin.amos.fas.core.common.request.CommonRequest;
+import com.yeejoin.amos.fas.core.util.CommonResponse;
+import com.yeejoin.amos.fas.core.util.CommonResponseUtil;
 import com.yeejoin.amos.fas.dao.entity.AccidentType;
-import com.yeejoin.amos.op.core.common.response.CommonResponse;
-import com.yeejoin.amos.op.core.util.CommonResponseUtil;
-import com.yeejoin.amos.security.entity.User;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -58,7 +59,9 @@ public class AccidentTypeController extends BaseController {
 	@ApiOperation(httpMethod = "GET",value = "事故类型查询不分页", notes = "事故类型查询不分页")
 	@RequestMapping(value = "/all-list", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
 	public CommonResponse queryRiskLevel() {
-		List<HashMap<String,Object>> list = iAccidentTypeService.queryAccidentType(getOrgCode());
+		ReginParams reginParams =getSelectedOrgInfo();
+		String compCode=getOrgCode(reginParams);
+		List<HashMap<String,Object>> list = iAccidentTypeService.queryAccidentType(compCode);
 		return CommonResponseUtil.success(list);
 	}
 	
@@ -71,11 +74,15 @@ public class AccidentTypeController extends BaseController {
 	@RequestMapping(value = "/editAccidentType", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
 	public CommonResponse checkPlanAdd(@ApiParam(value = "事故类型对象", required = true) @RequestBody AccidentType param) {
 		try {
-			User user = getUserInfo();
+			AgencyUserModel user = getUserInfo();
+			ReginParams reginParams =getSelectedOrgInfo();
+			String dep=getDepartmentId(reginParams);
+			String compCode=getOrgCode(reginParams);
+			
 			HashMap<String,Object> map = new HashMap<String,Object>();	
-			map.put("dept_id", user.getDepartment() == null ?"0":user.getDepartment().getId());
-			map.put("org_code", user.getCompany().getCompCode());
-			map.put("user_id", user.getId());
+			map.put("dept_id", dep);
+			map.put("org_code", compCode);
+			map.put("user_id", user.getUserId());
 			map.put("param", param);
 			iAccidentTypeService.editAccidentType(map);
 			return CommonResponseUtil.success();

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

@@ -15,8 +15,8 @@ import com.yeejoin.amos.fas.business.service.intfc.IAlarmService;
 import com.yeejoin.amos.fas.business.util.CommonPageParamUtil;
 import com.yeejoin.amos.fas.core.common.request.CommonPageable;
 import com.yeejoin.amos.fas.core.common.request.CommonRequest;
-import com.yeejoin.amos.op.core.common.response.CommonResponse;
-import com.yeejoin.amos.op.core.util.CommonResponseUtil;
+import com.yeejoin.amos.fas.core.util.CommonResponse;
+import com.yeejoin.amos.fas.core.util.CommonResponseUtil;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

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

@@ -11,17 +11,24 @@ import javax.servlet.http.HttpServletRequest;
 import javax.validation.ConstraintViolationException;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.transaction.TransactionSystemException;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.component.feign.config.InnerInvokException;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.fas.business.vo.ReginParams;
 import com.yeejoin.amos.fas.core.common.request.CommonRequest;
 import com.yeejoin.amos.fas.core.enums.QueryOperatorEnum;
+import com.yeejoin.amos.fas.core.util.DaoCriteria;
 import com.yeejoin.amos.fas.core.util.StringUtil;
-import com.yeejoin.amos.op.core.common.query.DaoCriteria;
-import com.yeejoin.amos.security.authorization.Authorization;
-import com.yeejoin.amos.security.common.remote.RemoteSecurityServer;
-import com.yeejoin.amos.security.entity.User;
+import com.yeejoin.amos.feign.privilege.Privilege;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+
 
 import springfox.documentation.annotations.ApiIgnore;
 
@@ -34,11 +41,11 @@ import springfox.documentation.annotations.ApiIgnore;
 @ApiIgnore
 @RestController
 @RequestMapping("/base")
-@Authorization
+//@Authorization
 public class BaseController {
 	
-	@Autowired
-	private RemoteSecurityServer remoteSecurityServer;
+//	@Autowired
+//	private RemoteSecurityServer remoteSecurityServer;
 	
 	@Autowired
 	protected HttpServletRequest request;
@@ -58,19 +65,50 @@ public class BaseController {
 	 */
 	protected static final int DEFAULT_PAGE_SIZE = 10;
 	
+	 @Autowired
+	    private RedisTemplate<String, String> redisTemplate;
 	  
-	protected String getToken() 
-	{
-		/* Get token from header */
-		String authToken = request.getHeader("X-Access-Token");
-		/* If token not found get it from request parameter */
-		if (authToken == null)
-		{
-			authToken = request.getParameter("token");
+
+	protected String getToken() {
+        String authToken = request.getHeader("token");
+        if (authToken == null) {
+            authToken = request.getHeader("X-Access-Token");
+        }
+        return authToken;
+    }
+    
+    protected String getProduct() {
+        String authToken = request.getHeader("product");
+        if (authToken == null) {
+            authToken = request.getParameter("product");
+        }
+        return authToken;
+    }
+
+    
+    protected String getAppKey() {
+        String authToken = request.getHeader("appKey");
+        if (authToken == null) {
+            authToken = request.getParameter("appKey");
         }
         return authToken;
     }
     
+    //redi缓存选择的用户信息
+    private String buildKey(String userId, String token) {
+        //return "region_" + userId + "_" + token.substring(0, token.indexOf('_', 1));
+        return "region_" + userId + "_" + token;
+
+    }
+
+    protected void saveSelectedOrgInfo(ReginParams reginParams) {
+        redisTemplate.opsForValue().set(buildKey(getUserId(), getToken()), JSONObject.toJSONString(reginParams));
+    }
+
+    protected ReginParams getSelectedOrgInfo() {
+        return JSON.parseObject(redisTemplate.opsForValue().get(buildKey(getUserId(), getToken())), ReginParams.class);
+    }
+	
 	/**
 	 * 
 	 * <pre>
@@ -79,64 +117,79 @@ public class BaseController {
 	 *
 	 * @return
 	 */
-	protected boolean isDirector()
-	{
-		if(getUserInfo() == null){
-			return false;
-		}
-		return getUserInfo().getRole().getRoleType() != 3;
-	}
+//	protected boolean isDirector()
+//	{
+//		if(getUserInfo() == null){
+//			return false;
+//		}
+//		return getUserInfo().getRole().getRoleType() != 3;
+//	}
 	/**
 	 * 获取用户角色id
 	 * @return
 	 */
-	protected String getRoleId()
+	/*protected String getRoleId()
 	{
 		if(getUserInfo() == null){
 			return "";
 		}
 		return getUserInfo().getRole().getRoleType().toString();
-	}
+	}*/
 	
 	/**
 	 * 当前登录用户信息
 	 */
-	protected User getUserInfo() {
-		if(getToken() == null){
-			return null;
+	 protected AgencyUserModel getUserInfo() {
+	    	AgencyUserModel userModel=null;
+	    	if(getToken()!=null){
+	    	RequestContext.setToken(getToken());
+	    	RequestContext.setProduct(getProduct());
+	    	RequestContext.setAppKey(getAppKey());
+	    	
+	    	FeignClientResult feignClientResult;
+			try {
+				feignClientResult = Privilege.agencyUserClient.getme();
+		    	 userModel = (AgencyUserModel) feignClientResult.getResult();
+
+			} catch (InnerInvokException e) {
+				e.printStackTrace();
 			}
-		return remoteSecurityServer.loginAuthentication(getToken());
+			
+	    	}
+	        return userModel;
+
+	       // return CurrentAuthentication.getAuthenticatedUserThreadLocal();
 	    }
 	
-	protected Long getUserId() 
+	protected String getUserId() 
 	{
-		Long userId = null;
+		String userId = null;
 		if (getUserInfo() != null)
 		{
-			userId = getUserInfo().getId();
+			userId = getUserInfo().getUserId();
 		}
 		return userId;
 	}
 	
-	protected Long getCompanyId() 
-	{
-		Long companyId = null;
-		if (getUserInfo() != null)
-		{
-			companyId = getUserInfo().getCompany().getId();
+	 protected String getCompanyId(ReginParams reginParams) {
+	        if (reginParams == null) {
+	            return null;
 	        }
-		return companyId;
+	        if (reginParams.getCompany() != null) {
+	            return reginParams.getCompany().getSequenceNbr();
+	        }
+	        return null;
 	    }
 	
 	/**
 	 * 获取当前用户所属公司名称
 	 * @return
 	 */
-	protected String getCurrentCompanyNameOfUser(){
-		if(getUserInfo() == null){
+	 protected String getCurrentCompanyNameOfUser() {
+			if (getUserInfo() == null) {
 				return "";
 			}
-		return getUserInfo().getCompany().getCompanyName();
+	return getSelectedOrgInfo().getCompany().getCompanyName();
 		}
 	
 	
@@ -158,11 +211,38 @@ public class BaseController {
 	 * 获取公司orgcode
 	 * @return
 	 */
-	protected String getOrgCode(){
-		if(getUserInfo() == null){
-			return "";
+
+	
+	 protected String getCompanyName(ReginParams reginParams) {
+	        if (reginParams == null) {
+	            return null;
 	        }
-		return getUserInfo().getCompany().getCompCode(); 
+	        if (reginParams.getCompany() != null) {
+	            return reginParams.getCompany().getCompanyName();
+	        }
+	        return null;
+	    }
+	 protected String getDepartmentId(ReginParams reginParams) {
+	        if (reginParams == null) {
+	            return null;
+	        }
+	        if (reginParams.getDepartment() != null) {
+	            return reginParams.getDepartment().getSequenceNbr();
+	        }
+	        return null;
+	    }
+	
+	  protected String getOrgCode(ReginParams reginParams) {
+	        if (reginParams == null) {
+	            return null;
+	        }
+//	        if (reginParams.getDepartment() != null) {
+//	            return reginParams.getDepartment().getDeptOrgCode();
+//	        }
+	        if (reginParams.getCompany() != null) {
+	            return reginParams.getCompany().getOrgCode();
+	        }
+	        return null;
 	    }
 
 	/**
@@ -211,7 +291,7 @@ public class BaseController {
 	 * 暂时未用到
 	 * @return
 	 */
-	public List<DaoCriteria> buildDaoCriteriasNoParam() {
+	/*public List<DaoCriteria> buildDaoCriteriasNoParam() {
 		List<DaoCriteria> daoCriterias = new ArrayList<DaoCriteria>();
 		String orgCode = getOrgCode();
 		if(isDirector()){
@@ -220,7 +300,7 @@ public class BaseController {
 			daoCriterias = buildOrgDaoCriteriaOutChildren(daoCriterias,orgCode);
 		}
 		return daoCriterias;
-	}
+	}*/
 	
 	/**
 	 * 

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

@@ -3,11 +3,12 @@ package com.yeejoin.amos.fas.business.controller;
 
 import com.yeejoin.amos.fas.business.service.intfc.IBizMessageService;
 import com.yeejoin.amos.fas.business.service.intfc.IWaterResourceService;
+import com.yeejoin.amos.fas.business.vo.ReginParams;
 import com.yeejoin.amos.fas.core.common.request.CommonPageable;
+import com.yeejoin.amos.fas.core.util.CommonResponse;
+import com.yeejoin.amos.fas.core.util.CommonResponseUtil;
 import com.yeejoin.amos.fas.dao.entity.WaterResource;
-import com.yeejoin.amos.op.core.common.response.CommonResponse;
-import com.yeejoin.amos.op.core.util.CommonResponseUtil;
-import com.yeejoin.amos.security.authorization.Authorization;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -26,7 +27,7 @@ public class BizMessageController extends BaseController{
     @Autowired
     IBizMessageService iBizMessageService;
 
-    @Authorization(ingore = true)
+    //@Authorization(ingore = true)
     @ApiOperation(httpMethod = "GET",value = "分页查询消息", notes = "分页查询消息")
     @RequestMapping(value = "/page", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
     public CommonResponse forPage(
@@ -37,8 +38,10 @@ public class BizMessageController extends BaseController{
                                     @RequestParam  int pageSize
     ) {
 
+		ReginParams reginParams =getSelectedOrgInfo();
+		String compCode=getOrgCode(reginParams);
         CommonPageable commonPageable = new CommonPageable(pageNumber,pageSize);
-        return CommonResponseUtil.success(iBizMessageService.queryForPage(StringUtils.trimToNull(time), StringUtils.trimToNull(type), StringUtils.trimToNull(title),StringUtils.trimToNull( this.getOrgCode().split("_")[0]), commonPageable));
+        return CommonResponseUtil.success(iBizMessageService.queryForPage(StringUtils.trimToNull(time), StringUtils.trimToNull(type), StringUtils.trimToNull(title),StringUtils.trimToNull( compCode), commonPageable));
     }
 
 }

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

@@ -3,13 +3,13 @@ package com.yeejoin.amos.fas.business.controller;
 import com.yeejoin.amos.fas.business.param.PointListParam;
 import com.yeejoin.amos.fas.business.param.QueryParamUtil;
 import com.yeejoin.amos.fas.business.service.intfc.ICommonService;
+import com.yeejoin.amos.fas.business.vo.ReginParams;
 import com.yeejoin.amos.fas.core.common.request.CommonPageable;
 import com.yeejoin.amos.fas.core.common.request.CommonRequest;
-import com.yeejoin.amos.fas.dao.entity.SDepartment;
-import com.yeejoin.amos.fas.dao.entity.SUser;
-import com.yeejoin.amos.op.core.common.response.CommonResponse;
-import com.yeejoin.amos.op.core.util.CommonResponseUtil;
-import com.yeejoin.amos.security.authorization.Authorization;
+import com.yeejoin.amos.fas.core.util.CommonResponse;
+import com.yeejoin.amos.fas.core.util.CommonResponseUtil;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -41,11 +41,12 @@ public class CommonController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "根据当前用户获取公司下部门信息", notes = "根据当前用户获取公司下部门信息")
     @RequestMapping(value = "/deptment/list", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
     public CommonResponse getDeptments() {
-        Long companyId = getCompanyId();
+		ReginParams reginParams =getSelectedOrgInfo();
+		String companyId =getCompanyId(reginParams);
         if (companyId == null) {
             return CommonResponseUtil.failure("公司信息获取失败！");
         }
-        List<SDepartment> deps = commonService.getDepartment(companyId);
+        List<DepartmentModel> deps = commonService.getDepartment(getToken(),getProduct(),getAppKey(), companyId);
         return CommonResponseUtil.success(deps);
     }
 
@@ -79,7 +80,7 @@ public class CommonController extends BaseController {
      * @param
      * @return
      */
-    @Authorization(ingore = true)
+    //@Authorization(ingore = true)
     @ApiOperation(value = "查询巡检点项信息", notes = "查询巡检点项信息")
     @PostMapping(value = "/pointInputlist", produces = "application/json;charset=UTF-8")
     public CommonResponse getPointInputs(
@@ -105,18 +106,20 @@ public class CommonController extends BaseController {
      */
     @ApiOperation(httpMethod = "GET", value = "根据部门获取部门人员信息", notes = "根据部门获取部门人员信息")
     @RequestMapping(value = "/{departmentId}/user/list", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
-    public CommonResponse getUsers(@ApiParam(value = "部门ID", required = true) @PathVariable Long departmentId) {
+    public CommonResponse getUsers(@ApiParam(value = "部门ID", required = true) @PathVariable String departmentId) {
         if (departmentId == null) {
             return CommonResponseUtil.failure("部门信息获取失败！");
         }
-        List<SUser> users = commonService.getUsers(departmentId);
+        List<AgencyUserModel> users = commonService.getUsers(getToken(),getProduct(),getAppKey(),departmentId);
         return CommonResponseUtil.success(users);
     }
 
     @ApiOperation(httpMethod = "GET", value = "获取公司下人员列表", notes = "获取公司下人员列表")
     @GetMapping(value = "/user/list", produces = "application/json;charset=UTF-8")
     public  CommonResponse getAllUser() {
-        List<SUser> users = commonService.getAllUser();
+    	ReginParams reginParams =getSelectedOrgInfo();
+		String compCode=getOrgCode(reginParams);
+        List<AgencyUserModel> users = commonService.getAllUser(getToken(),getProduct(),getAppKey(), compCode);
         return CommonResponseUtil.success(users);
     }
 }

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

@@ -13,11 +13,9 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.yeejoin.amos.fas.business.service.intfc.IDictService;
 import com.yeejoin.amos.fas.core.common.request.CommonPageable;
+import com.yeejoin.amos.fas.core.util.CommonResponse;
+import com.yeejoin.amos.fas.core.util.CommonResponseUtil;
 import com.yeejoin.amos.fas.dao.entity.Dict;
-import com.yeejoin.amos.op.core.common.response.CommonResponse;
-import com.yeejoin.amos.op.core.util.CommonResponseUtil;
-import com.yeejoin.amos.security.authorization.Authorization;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -37,7 +35,7 @@ public class DictController extends BaseController{
 	 */
 	@ApiOperation(httpMethod = "GET",value = "根据查询条件列出字典列表", notes = "根据查询条件列出字典列表")
 	@RequestMapping(value = "/dict/page", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
-	@Authorization(ingore=true)
+	//@Authorization(ingore=true)
 	public CommonResponse page(Dict dict,
 			@ApiParam(value = "分页参数", defaultValue = "pageNumber=0&pageSize=10") CommonPageable commonPageable){
 		try {
@@ -55,7 +53,7 @@ public class DictController extends BaseController{
 	 */
 	@ApiOperation(httpMethod = "GET",value = "根据查询条件列出字典列表", notes = "根据查询条件列出字典列表")
 	@RequestMapping(value = "/dict/list", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
-	@Authorization(ingore=true)
+	//@Authorization(ingore=true)
 	public CommonResponse list(Dict dict){
 		try {
 			List<Dict> dictList = dictService.getDictList(dict);
@@ -72,7 +70,7 @@ public class DictController extends BaseController{
 	 */
 	@ApiOperation(httpMethod = "GET",value = "根据IDs查询字典详情", notes = "根据IDs查询字典详情")
 	@RequestMapping(value = "/dict/list/{ids}", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
-	@Authorization(ingore=true)
+	//@Authorization(ingore=true)
 	public CommonResponse list(Long[] ids){
 		List<Dict> dictList = dictService.getDictListByIds(ids);
 		return CommonResponseUtil.success(dictList);
@@ -84,7 +82,7 @@ public class DictController extends BaseController{
 	 */
 	@ApiOperation(httpMethod = "GET",value = "根据ID查询字典详情", notes = "根据ID查询字典详情")
 	@RequestMapping(value = "/dict/list/{id}", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
-	@Authorization(ingore=true)
+	//@Authorization(ingore=true)
 	public CommonResponse list(long id){
 		Dict dict = dictService.getDictById(id);
 		return CommonResponseUtil.success(dict);
@@ -97,7 +95,7 @@ public class DictController extends BaseController{
 	 */
 	@ApiOperation(httpMethod = "DELETE",value = "根据ID删除字典", notes = "根据ID删除字典")
 	@RequestMapping(value = "/dict/delete/{id}", produces = "application/json;charset=UTF-8", method = RequestMethod.DELETE)
-	@Authorization(ingore=true)
+	//@Authorization(ingore=true)
 	public CommonResponse delete(long id){
 		dictService.deleteDictById(id);
 		return CommonResponseUtil.success();
@@ -109,7 +107,7 @@ public class DictController extends BaseController{
 	 */
 	@ApiOperation(httpMethod = "DELETE",value = "根据IDs删除字典", notes = "根据IDs删除字典")
 	@RequestMapping(value = "/dict/delete/{ids}", produces = "application/json;charset=UTF-8", method = RequestMethod.DELETE)
-	@Authorization(ingore=true)
+	//@Authorization(ingore=true)
 	public CommonResponse deletes(long[] ids){
 		dictService.deleteDictByIds(ids);
 		return CommonResponseUtil.success();
@@ -121,7 +119,7 @@ public class DictController extends BaseController{
 	 */
 	@ApiOperation(httpMethod = "POST",value = "新增字典", notes = "新增字典")
 	@RequestMapping(value = "/dict/add", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
-	@Authorization(ingore=true)
+	//@Authorization(ingore=true)
 	public CommonResponse add(@RequestBody Dict dict){
 		dictService.saveDict(dict);
 		return CommonResponseUtil.success();
@@ -133,7 +131,7 @@ public class DictController extends BaseController{
 	 */
 	@ApiOperation(httpMethod = "PUT",value = "编辑字典信息", notes = "编辑字典信息")
 	@RequestMapping(value = "/dict/edit", produces = "application/json;charset=UTF-8", method = RequestMethod.PUT)
-	@Authorization(ingore=true)
+	//@Authorization(ingore=true)
 	public CommonResponse edit(@RequestBody Dict dict){
 		dictService.saveDict(dict);
 		return CommonResponseUtil.success();

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

@@ -2,16 +2,17 @@ package com.yeejoin.amos.fas.business.controller;
 
 import com.yeejoin.amos.fas.business.param.ImgParam;
 import com.yeejoin.amos.fas.business.service.intfc.IEquipmentService;
+import com.yeejoin.amos.fas.business.vo.ReginParams;
 import com.yeejoin.amos.fas.core.common.request.CommonPageable;
 import com.yeejoin.amos.fas.core.common.request.CommonRequest;
+import com.yeejoin.amos.fas.core.util.CommonResponse;
+import com.yeejoin.amos.fas.core.util.CommonResponseUtil;
+import com.yeejoin.amos.fas.core.util.DaoCriteria;
 import com.yeejoin.amos.fas.core.util.StringUtil;
 import com.yeejoin.amos.fas.dao.entity.Equipment;
 import com.yeejoin.amos.fas.dao.entity.EquipmentFireEquipment;
 import com.yeejoin.amos.fas.dao.entity.PreplanPicture;
-import com.yeejoin.amos.op.core.common.query.DaoCriteria;
-import com.yeejoin.amos.op.core.common.response.CommonResponse;
-import com.yeejoin.amos.op.core.util.CommonResponseUtil;
-import com.yeejoin.amos.security.authorization.Authorization;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -42,9 +43,12 @@ public class EquipmentController extends BaseController {
     @RequestMapping(value = "", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
     public CommonResponse create(@RequestBody Equipment equipment) throws Exception {
 
-        equipment.setCreateBy(this.getUserId().intValue());
+    	
+		ReginParams reginParams =getSelectedOrgInfo();
+		String compCode=getOrgCode(reginParams);
+        equipment.setCreateBy(getUserId());
         equipment.setCreateDate(new Date());
-        equipment.setOrgCode(this.getOrgCode());
+        equipment.setOrgCode(compCode);
         return CommonResponseUtil.success(iEquipService.save(equipment));
     }
 
@@ -90,7 +94,7 @@ public class EquipmentController extends BaseController {
      * @param id
      * @return
      */
-    @Authorization(ingore = true)
+    //@Authorization(ingore = true)
     @ApiOperation(httpMethod = "GET", value = "现场图查询", notes = "现场图查询")
     @RequestMapping(value = "/pre-picture", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
     public CommonResponse queryImpEquipImg(
@@ -131,7 +135,7 @@ public class EquipmentController extends BaseController {
      *
      * @return
      */
-    @Authorization(ingore = true)
+    //@Authorization(ingore = true)
     @ApiOperation(httpMethod = "POST", value = "绑定消防设备", notes = "绑定消防设备")
     @RequestMapping(value = "/{id}/fireeqmt", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
     public CommonResponse bindFireEqumt(@PathVariable("id") Long equipmentId, @RequestBody List<EquipmentFireEquipment> equipmentFireEquipment) throws Exception {
@@ -146,7 +150,7 @@ public class EquipmentController extends BaseController {
      *
      * @return
      */
-    @Authorization(ingore = true)
+    //@Authorization(ingore = true)
     @ApiOperation(httpMethod = "DELETE", value = "解除绑定消防设备", notes = "解除绑定消防设备")
     @RequestMapping(value = "/{equipmentId}/fireeqmt/{fireEquipmentIds}", produces = "application/json;charset=UTF-8", method = RequestMethod.DELETE)
     public CommonResponse bindFireEqumt(
@@ -189,7 +193,7 @@ public class EquipmentController extends BaseController {
      * @param img4      消防取水图
      * @return
      */
-    @Authorization(ingore = true)
+    //@Authorization(ingore = true)
     @ApiOperation(httpMethod = "POST", value = "编辑装备及上传现场图", notes = "编辑装备及上传现场图")
     @RequestMapping(value = "/uploadEquipmentImg", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
     public CommonResponse uploadEquipmentImg(
@@ -197,6 +201,8 @@ public class EquipmentController extends BaseController {
             @RequestParam(value = "img2", required = false) MultipartFile img2,
             @RequestParam(value = "img3", required = false) MultipartFile img3,
             @RequestParam(value = "img4", required = false) MultipartFile img4, Equipment equipment) {
+    	ReginParams reginParams =getSelectedOrgInfo();
+		String compCode=getOrgCode(reginParams);
         ImgParam[] imgs = new ImgParam[4];
         ImgParam imgParam1 = new ImgParam();
         imgParam1.setFile(img1);
@@ -214,8 +220,8 @@ public class EquipmentController extends BaseController {
         imgs[1] = imgParam2;
         imgs[2] = imgParam3;
         imgs[3] = imgParam4;
-        equipment.setOrgCode(this.getOrgCode());
-        equipment.setCreateBy(this.getUserId().intValue());
+        equipment.setOrgCode(compCode);
+        equipment.setCreateBy(getUserId());
         iEquipService.saveEquipmentAndImg(imgs, equipment);
         return CommonResponseUtil.success();
     }
@@ -226,7 +232,7 @@ public class EquipmentController extends BaseController {
      * @param equipmentId
      * @return
      */
-    @Authorization(ingore = true)
+    //@Authorization(ingore = true)
     @ApiOperation(httpMethod = "GET", value = "查询指定重点设备已经绑定的消防设备", notes = "查询指定重点设备已经绑定的消防设备")
     @GetMapping(value = "/videos", produces = "application/json;charset=UTF-8")
     public CommonResponse findVideoList() {
@@ -239,7 +245,7 @@ public class EquipmentController extends BaseController {
      * @param equipmentId
      * @return
      */
-    @Authorization(ingore = true)
+    //@Authorization(ingore = true)
     @ApiOperation(httpMethod = "GET", value = "重点装备详情", notes = "重点装备详情")
     @GetMapping(value = "/detail/{equipmentId}", produces = "application/json;charset=UTF-8")
     public CommonResponse findEquipDetail(@PathVariable Long equipmentId) {
@@ -252,7 +258,7 @@ public class EquipmentController extends BaseController {
      * @param equipmentId
      * @return
      */
-    @Authorization(ingore = true)
+    //@Authorization(ingore = true)
     @ApiOperation(httpMethod = "GET", value = "获取所有重点装备无分页", notes = "获取所有重点装备无分页")
     @GetMapping(value = "/all", produces = "application/json;charset=UTF-8")
     public CommonResponse findAll() {
@@ -279,7 +285,7 @@ public class EquipmentController extends BaseController {
      *
      * @return
      */
-    @Authorization(ingore = true)
+    //@Authorization(ingore = true)
     @ApiOperation(httpMethod = "GET", value = "获取设备数据", notes = "获取设备数据")
     @RequestMapping(value = "/queryEquipmentDate/{code}", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
     public CommonResponse queryEquipmentData(@PathVariable String code) {

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

@@ -9,8 +9,8 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.yeejoin.amos.fas.business.service.intfc.IEvaModelService;
-import com.yeejoin.amos.op.core.common.response.CommonResponse;
-import com.yeejoin.amos.op.core.util.CommonResponseUtil;
+import com.yeejoin.amos.fas.core.util.CommonResponse;
+import com.yeejoin.amos.fas.core.util.CommonResponseUtil;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

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

@@ -6,10 +6,9 @@ import com.yeejoin.amos.fas.business.param.FireEquipmentPointParam;
 import com.yeejoin.amos.fas.business.param.WaterResourceParam;
 import com.yeejoin.amos.fas.business.service.intfc.IExcelService;
 import com.yeejoin.amos.fas.business.util.FileHelper;
+import com.yeejoin.amos.fas.core.util.CommonResponse;
+import com.yeejoin.amos.fas.core.util.CommonResponseUtil;
 import com.yeejoin.amos.fas.core.util.FileUtil;
-import com.yeejoin.amos.op.core.common.response.CommonResponse;
-import com.yeejoin.amos.op.core.util.CommonResponseUtil;
-import com.yeejoin.amos.security.authorization.Authorization;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -73,7 +72,7 @@ public class ExcelController extends BaseController {
 
     @ApiOperation(value = "导出数据", notes = "导出数据")
     @PostMapping(value = "/export")
-    @Authorization(ingore = true)
+  //@Authorization(ingore = true)
     public void export(HttpServletResponse response,
                        @ApiParam(value = "data：导出数据；model：导出模板", required = true) @RequestParam String exportType,
                        @ApiParam(value = "point：监测点；equipment：设备", required = true) @RequestParam String modelName,

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

@@ -3,9 +3,6 @@ package com.yeejoin.amos.fas.business.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.fas.business.service.intfc.IPlanVisual3dService;
 import com.yeejoin.amos.fas.core.util.*;
-import com.yeejoin.amos.op.core.common.response.CommonResponse;
-import com.yeejoin.amos.op.core.util.CommonResponseUtil;
-import com.yeejoin.amos.security.authorization.Authorization;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.apache.commons.collections.CollectionUtils;
@@ -34,7 +31,7 @@ import java.util.Map;
 
 @RestController
 @RequestMapping(value = "/file")
-@Authorization(ingore = true)
+//@Authorization(ingore = true)
 public class FileController extends BaseController {
 
     private static final transient Logger log = LoggerFactory.getLogger(FileController.class);

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

@@ -12,11 +12,11 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import com.yeejoin.amos.fas.business.service.intfc.IFireCarService;
+import com.yeejoin.amos.fas.business.vo.ReginParams;
+import com.yeejoin.amos.fas.core.util.CommonResponse;
+import com.yeejoin.amos.fas.core.util.CommonResponseUtil;
 import com.yeejoin.amos.fas.dao.entity.FireCar;
-import com.yeejoin.amos.op.core.common.response.CommonResponse;
-import com.yeejoin.amos.op.core.util.CommonResponseUtil;
-import com.yeejoin.amos.security.authorization.Authorization;
-
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -34,13 +34,16 @@ public class FireCarController extends BaseController {
 	@RequestMapping(value = "", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
 	public CommonResponse create(@RequestBody FireCar fireCar) throws Exception {
 
-		fireCar.setCreateBy(this.getUserId().intValue());
+		ReginParams reginParams =getSelectedOrgInfo();
+		String compCode=getOrgCode(reginParams);
+		
+		fireCar.setCreateBy(getUserId());
 		fireCar.setCreateDate(new Date());
-		fireCar.setOrgCode(this.getOrgCode());
+		fireCar.setOrgCode(compCode);
 		return CommonResponseUtil.success(fireCarService.save(fireCar));
 	}
 
-	@Authorization(ingore = true)
+	//@Authorization(ingore = true)
 	@ApiOperation(httpMethod = "PUT", value = "编辑消防车", notes = "编辑消防车")
 	@RequestMapping(value = "/{id}", produces = "application/json;charset=UTF-8", method = RequestMethod.PUT)
 	public CommonResponse udpate(@PathVariable Long id, @RequestBody FireCar fireCar) {
@@ -63,12 +66,15 @@ public class FireCarController extends BaseController {
 		return CommonResponseUtil.success(fireCarService.delete(idArray));
 	}
 
-	@Authorization(ingore = true)
+	//@Authorization(ingore = true)
 	@ApiOperation(httpMethod = "POST", value = "上传消防车图片", notes = "上传消防车图片")
 	@RequestMapping(value = "/uploadCarImg", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
 	public CommonResponse uploadCarImg(@ApiParam(value = "消防车图片", required = false) @RequestParam(value = "file" ,required = false) MultipartFile[] file,FireCar fireCar) {
-		fireCar.setOrgCode(this.getOrgCode());
-		fireCar.setCreateBy(this.getUserId().intValue());
+		
+		ReginParams reginParams =getSelectedOrgInfo();
+		String compCode=getOrgCode(reginParams);
+		fireCar.setOrgCode(compCode);
+		fireCar.setCreateBy(getUserId());
 		fireCarService.saveFireCarAndPhoto(fireCar,file);
 		return CommonResponseUtil.success();
 	}

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

@@ -4,10 +4,11 @@ import com.google.common.collect.Maps;
 import com.yeejoin.amos.fas.business.entity.mybatis.FireEquipmentPointEntity;
 import com.yeejoin.amos.fas.business.service.intfc.IFireEquipPontService;
 import com.yeejoin.amos.fas.core.common.request.CommonPageable;
+import com.yeejoin.amos.fas.core.util.CommonResponse;
+import com.yeejoin.amos.fas.core.util.CommonResponseUtil;
 import com.yeejoin.amos.fas.dao.entity.FireEquipmentPoint;
-import com.yeejoin.amos.op.core.common.response.CommonResponse;
-import com.yeejoin.amos.op.core.util.CommonResponseUtil;
-import com.yeejoin.amos.security.authorization.Authorization;
+
+//import com.yeejoin.amos.security.authorization.Authorization;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -49,13 +50,13 @@ public class FireEquimtPointController extends BaseController {
                 || StringUtils.isEmpty(fireEquipmentPoint.getCode()))
             throw new Exception("数据校验失败.");
 
-        fireEquipmentPoint.setCreateBy(this.getUserId());
+        fireEquipmentPoint.setCreateBy(getUserId());
         fireEquipmentPoint.setCreateDate(new Date());
         return CommonResponseUtil.success(fireEquipPontService.savePoint(fireEquipmentPoint));
     }
 
 
-    @Authorization(ingore = true)
+   // @Authorization(ingore = true)
     @ApiOperation(httpMethod = "PUT", value = "编辑风险点", notes = "编辑风险点")
     @RequestMapping(value = "/{id}", produces = "application/json;charset=UTF-8", method = RequestMethod.PUT)
     public CommonResponse udpatePoint(@PathVariable Long id, @RequestBody FireEquipmentPoint fireEquipmentPoint) {
@@ -72,7 +73,7 @@ public class FireEquimtPointController extends BaseController {
     }
 
 
-    @Authorization(ingore = true)
+    //@Authorization(ingore = true)
     @ApiOperation(httpMethod = "DELETE", value = "删除风险点", notes = "查询单个风险单")
     @RequestMapping(value = "/{ids}", produces = "application/json;charset=UTF-8", method = RequestMethod.DELETE)
     public CommonResponse deletePoint(@PathVariable String ids) throws Exception {

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

@@ -5,11 +5,13 @@ import com.yeejoin.amos.fas.business.service.intfc.IFireCarService;
 import com.yeejoin.amos.fas.business.service.intfc.IFireEquipService;
 import com.yeejoin.amos.fas.business.util.CommonPageParamUtil;
 import com.yeejoin.amos.fas.business.vo.FireCarDetailVo;
+import com.yeejoin.amos.fas.business.vo.ReginParams;
 import com.yeejoin.amos.fas.core.common.request.CommonPageable;
 import com.yeejoin.amos.fas.core.common.request.CommonRequest;
+import com.yeejoin.amos.fas.core.util.CommonResponse;
+import com.yeejoin.amos.fas.core.util.CommonResponseUtil;
 import com.yeejoin.amos.fas.dao.entity.FireEquipment;
-import com.yeejoin.amos.op.core.common.response.CommonResponse;
-import com.yeejoin.amos.op.core.util.CommonResponseUtil;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -34,10 +36,11 @@ public class FireSourceController extends BaseController {
 	@ApiOperation(httpMethod = "POST", value = "添加消防装备", notes = "添加消防装备")
 	@RequestMapping(value = "", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
 	public CommonResponse create(@RequestBody FireEquipment fireEquipment) throws Exception {
-
-		fireEquipment.setCreateBy(this.getUserId().intValue());
+		ReginParams reginParams =getSelectedOrgInfo();
+		String compCode=getOrgCode(reginParams);
+		fireEquipment.setCreateBy(getUserId());
 		fireEquipment.setCreateDate(new Date());
-		fireEquipment.setOrgCode(this.getOrgCode());
+		fireEquipment.setOrgCode(compCode);
 		return CommonResponseUtil.success(iFireEquipService.save(fireEquipment));
 	}
 

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

 package com.yeejoin.amos.fas.business.controller;
 
 import com.yeejoin.amos.fas.business.service.intfc.IFireStationService;
+import com.yeejoin.amos.fas.business.vo.ReginParams;
 import com.yeejoin.amos.fas.core.common.request.CommonPageable;
+import com.yeejoin.amos.fas.core.util.CommonResponse;
+import com.yeejoin.amos.fas.core.util.CommonResponseUtil;
 import com.yeejoin.amos.fas.dao.entity.FireStation;
 import com.yeejoin.amos.fas.dao.entity.FireStationFireEquipment;
-import com.yeejoin.amos.op.core.common.response.CommonResponse;
-import com.yeejoin.amos.op.core.util.CommonResponseUtil;
-import com.yeejoin.amos.security.authorization.Authorization;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -35,10 +35,11 @@ public class FireStationController extends BaseController {
 				|| StringUtils.isEmpty(fireStation.getAddress()) || StringUtils.isEmpty(fireStation.getPosition3d())
 				|| StringUtils.isEmpty(fireStation.getCode()))
 			throw new Exception("数据校验失败.");
-
+		ReginParams reginParams =getSelectedOrgInfo();
+		String compCode=getOrgCode(reginParams);
 		fireStation.setCreateBy(0);
 		fireStation.setCreateDate(new Date());
-		fireStation.setOrgCode(this.getOrgCode());
+		fireStation.setOrgCode(compCode);
 		return CommonResponseUtil.success(iFireStationService.save(fireStation));
 	}
 
@@ -109,7 +110,7 @@ public class FireStationController extends BaseController {
 				StringUtils.trimToNull(code), StringUtils.trimToNull(type), commonPageable));
 	}
 
-	@Authorization(ingore = true)
+	//@Authorization(ingore = true)
 	@ApiOperation(httpMethod = "GET", value = "列表查询消防小室", notes = "分页查询消防小室")
 	@RequestMapping(value = "/list", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
 	public CommonResponse forList(
@@ -122,7 +123,7 @@ public class FireStationController extends BaseController {
 				StringUtils.trimToNull(code), StringUtils.trimToNull(type)));
 	}
 
-	@Authorization(ingore = true)
+	//@Authorization(ingore = true)
 	@ApiOperation(httpMethod = "POST", value = "添加消防小室及上传图片", notes = "添加消防小室及上传图片")
 	@RequestMapping(value = "createAndSaveImg", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
 	public CommonResponse createAndSaveImg(@RequestParam(value = "file", required = false) MultipartFile[] file,
@@ -133,10 +134,11 @@ public class FireStationController extends BaseController {
 //				|| StringUtils.isEmpty(fireStation.getPosition3d())
 				|| StringUtils.isEmpty(fireStation.getCode()))
 			throw new Exception("数据校验失败.");
-
+		ReginParams reginParams =getSelectedOrgInfo();
+		String compCode=getOrgCode(reginParams);
 		fireStation.setCreateBy(0);
 		fireStation.setCreateDate(new Date());
-		fireStation.setOrgCode(this.getOrgCode());
+		fireStation.setOrgCode(compCode);
 		return CommonResponseUtil.success(iFireStationService.saveAndUpd(fireStation, file));
 	}
 	

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

@@ -14,11 +14,9 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.yeejoin.amos.fas.business.service.intfc.FireStengthService;
 import com.yeejoin.amos.fas.core.common.request.CommonPageable;
+import com.yeejoin.amos.fas.core.util.CommonResponse;
+import com.yeejoin.amos.fas.core.util.CommonResponseUtil;
 import com.yeejoin.amos.fas.dao.entity.FireStrength;
-import com.yeejoin.amos.op.core.common.response.CommonResponse;
-import com.yeejoin.amos.op.core.util.CommonResponseUtil;
-import com.yeejoin.amos.security.authorization.Authorization;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -31,7 +29,7 @@ public class FireStrengthController extends BaseController{
 
     @Autowired
     FireStengthService fireStengthService;
-    @Authorization(ingore = true)
+    //@Authorization(ingore = true)
     @ApiOperation(httpMethod = "POST",value = "添加专职人员", notes = "添加专职人员")
     @RequestMapping(value = "", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
     public CommonResponse createPoint(@RequestBody FireStrength fireStrength)  throws Exception{
@@ -48,7 +46,7 @@ public class FireStrengthController extends BaseController{
         return CommonResponseUtil.success(fireStengthService.savePoint(fireStrength));
     }
 
-    @Authorization(ingore = true)
+   // @Authorization(ingore = true)
     @ApiOperation(httpMethod = "PUT",value = "编辑专职人员", notes = "编辑专职人员")
     @RequestMapping(value = "/{id}", produces = "application/json;charset=UTF-8", method = RequestMethod.PUT)
     public CommonResponse udpatePoint(@PathVariable Long id, @RequestBody FireStrength fireStrength) {
@@ -56,7 +54,7 @@ public class FireStrengthController extends BaseController{
         return CommonResponseUtil.success(fireStengthService.savePoint(fireStrength));
     }
 
-    @Authorization(ingore = true)
+    //@Authorization(ingore = true)
     @ApiOperation(httpMethod = "GET",value = "查询单个专职人员", notes = "查询单个专职人员")
     @RequestMapping(value = "/{id}", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
     public CommonResponse queryPoint(@PathVariable Long id) {
@@ -65,7 +63,7 @@ public class FireStrengthController extends BaseController{
     }
 
 
-    @Authorization(ingore = true)
+    //@Authorization(ingore = true)
     @ApiOperation(httpMethod = "DELETE",value = "删除专职人员", notes = "查询单个专职人员")
     @RequestMapping(value = "/{ids}", produces = "application/json;charset=UTF-8", method = RequestMethod.DELETE)
     public CommonResponse deletePoint(@PathVariable String  ids) throws Exception {
@@ -73,7 +71,7 @@ public class FireStrengthController extends BaseController{
         return CommonResponseUtil.success(fireStengthService.deletePoint(idArray));
     }
 
-    @Authorization(ingore = true)
+    //@Authorization(ingore = true)
     @ApiOperation(httpMethod = "GET",value = "分页查询专职人员", notes = "分页查询专职人员")
     @RequestMapping(value = "/page", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
     public CommonResponse pointList(

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

 package com.yeejoin.amos.fas.business.controller;
 
 import com.yeejoin.amos.fas.business.service.intfc.Node3dVoService;
-import com.yeejoin.amos.op.core.common.response.CommonResponse;
-import com.yeejoin.amos.op.core.util.CommonResponseUtil;
-import com.yeejoin.amos.security.authorization.Authorization;
+import com.yeejoin.amos.fas.core.util.CommonResponse;
+import com.yeejoin.amos.fas.core.util.CommonResponseUtil;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;

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

 package com.yeejoin.amos.fas.business.controller;
 
 import com.yeejoin.amos.fas.business.service.intfc.IPlanVisual3dService;
+import com.yeejoin.amos.fas.core.util.CommonResponse;
+import com.yeejoin.amos.fas.core.util.CommonResponseUtil;
 import com.yeejoin.amos.fas.dao.entity.TextPlan;
-import com.yeejoin.amos.op.core.common.response.CommonResponse;
-import com.yeejoin.amos.op.core.util.CommonResponseUtil;
-import com.yeejoin.amos.security.authorization.Authorization;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -64,7 +63,7 @@ public class PlanVisual3dController extends BaseController {
         return CommonResponseUtil.success(planVisual3dService.getTextPlanInfoById(id));
     }
     
-    @Authorization(ingore = true)
+    //@Authorization(ingore = true)
     @RequestMapping(value = "/plan/text/downloadFile/{id}", method = RequestMethod.GET)
     public HttpServletResponse download(@PathVariable("id") Long id) {
     	TextPlan testPlan = planVisual3dService.getTextPlanInfoById(id);
@@ -113,7 +112,7 @@ public class PlanVisual3dController extends BaseController {
      * 资源设备信息查询
      */
     @ApiOperation(httpMethod = "GET", value = "资源查询", notes = "资源查询")
-    @Authorization(ingore = true)
+    //@Authorization(ingore = true)
     @GetMapping(value = "/resource/{type}/list")
     public CommonResponse getResourceList(@ApiParam(value = "资源类型", required = true) @PathVariable String type) {
         return planVisual3dService.getResourceListByType(type);
@@ -125,7 +124,7 @@ public class PlanVisual3dController extends BaseController {
      * @param id
      * @return
      */
-    @Authorization(ingore = true)
+    //@Authorization(ingore = true)
     @GetMapping(value = "/{type}/detail/{id}")
     @ApiOperation(value = "数据项查询", notes = "按照分类及id查询数据项")
     public CommonResponse getResourceDetail(

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

@@ -3,12 +3,13 @@ package com.yeejoin.amos.fas.business.controller;
 import com.yeejoin.amos.fas.business.param.CommonPageInfoParam;
 import com.yeejoin.amos.fas.business.service.intfc.IRiskFactorService;
 import com.yeejoin.amos.fas.business.util.CommonPageParamUtil;
+import com.yeejoin.amos.fas.business.vo.ReginParams;
 import com.yeejoin.amos.fas.core.common.request.CommonPageable;
 import com.yeejoin.amos.fas.core.common.request.CommonRequest;
+import com.yeejoin.amos.fas.core.util.CommonResponse;
+import com.yeejoin.amos.fas.core.util.CommonResponseUtil;
 import com.yeejoin.amos.fas.dao.entity.RiskFactor;
-import com.yeejoin.amos.op.core.common.response.CommonResponse;
-import com.yeejoin.amos.op.core.util.CommonResponseUtil;
-import com.yeejoin.amos.security.entity.User;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -66,11 +67,14 @@ public class RiskFactorController extends BaseController {
             if (count > 0) {
                 return CommonResponseUtil.failure("危险因素名称重复：" + param.getName());
             }
-            User user = getUserInfo();
+            AgencyUserModel user = getUserInfo();
+			ReginParams reginParams =getSelectedOrgInfo();
+			String dep=getDepartmentId(reginParams);
+			String compCode=getOrgCode(reginParams);
             HashMap<String, Object> map = new HashMap<>();
-            map.put("org_code", user.getCompany().getCompCode());
-            map.put("user_id", user.getId());
-            map.put("dept_id", user.getDepartment() == null ? "0" : user.getDepartment().getId());
+            map.put("org_code", compCode);
+            map.put("user_id", user.getUserId());
+            map.put("dept_id", dep);
             map.put("param", param);
             iRiskFactorService.editRiskFactor(map);
             return CommonResponseUtil.success();

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

@@ -3,12 +3,13 @@ package com.yeejoin.amos.fas.business.controller;
 import com.yeejoin.amos.fas.business.param.CommonPageInfoParam;
 import com.yeejoin.amos.fas.business.service.intfc.IRiskLevelService;
 import com.yeejoin.amos.fas.business.util.CommonPageParamUtil;
+import com.yeejoin.amos.fas.business.vo.ReginParams;
 import com.yeejoin.amos.fas.core.common.request.CommonPageable;
 import com.yeejoin.amos.fas.core.common.request.CommonRequest;
+import com.yeejoin.amos.fas.core.util.CommonResponse;
+import com.yeejoin.amos.fas.core.util.CommonResponseUtil;
 import com.yeejoin.amos.fas.dao.entity.RiskLevel;
-import com.yeejoin.amos.op.core.common.response.CommonResponse;
-import com.yeejoin.amos.op.core.util.CommonResponseUtil;
-import com.yeejoin.amos.security.entity.User;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -69,10 +70,12 @@ public class RiskLevelController extends BaseController {
             if (count > 0) {
                 return CommonResponseUtil.failure("风险等级重复：" + param.getLevel() + "级");
             }
-            User user = getUserInfo();
+            AgencyUserModel user = getUserInfo();
+			ReginParams reginParams =getSelectedOrgInfo();
+			String compCode=getOrgCode(reginParams);
             HashMap<String, Object> map = new HashMap<>();
-            map.put("org_code", user.getCompany().getCompCode());
-            map.put("user_id", user.getId());
+            map.put("org_code", compCode);
+            map.put("user_id", user.getUserId());
             map.put("param", param);
             iRiskLevelService.editRiskLevel(map);
             return CommonResponseUtil.success();

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

@@ -5,15 +5,16 @@ import com.yeejoin.amos.fas.business.param.RiskFmeaParam;
 import com.yeejoin.amos.fas.business.service.intfc.IFmeaService;
 import com.yeejoin.amos.fas.business.service.intfc.IRiskSourceService;
 import com.yeejoin.amos.fas.business.util.CommonPageParamUtil;
+import com.yeejoin.amos.fas.business.vo.ReginParams;
 import com.yeejoin.amos.fas.client.invoke.RsDataQueue;
 import com.yeejoin.amos.fas.core.common.request.CommonPageable;
 import com.yeejoin.amos.fas.core.common.request.CommonRequest;
+import com.yeejoin.amos.fas.core.util.CommonResponse;
+import com.yeejoin.amos.fas.core.util.CommonResponseUtil;
 import com.yeejoin.amos.fas.dao.entity.Fmea;
 import com.yeejoin.amos.fas.dao.entity.RiskSource;
-import com.yeejoin.amos.op.core.common.response.CommonResponse;
-import com.yeejoin.amos.op.core.util.CommonResponseUtil;
-import com.yeejoin.amos.security.authorization.Authorization;
-import com.yeejoin.amos.security.entity.User;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -68,10 +69,12 @@ public class RiskModelController extends BaseController {
             if (type.equals(2) && isRegion.equals("TRUE")) {
                 return CommonResponseUtil.failure("该区域下只能添加风险点");
             }
-            User user = getUserInfo();
+            AgencyUserModel user = getUserInfo();
+			ReginParams reginParams =getSelectedOrgInfo();
+			String compCode=getOrgCode(reginParams);
             HashMap<String, Object> map = new HashMap<>();
-            map.put("org_code", user.getOrgCode());
-            map.put("user_id", user.getId());
+            map.put("org_code", compCode);
+            map.put("user_id", user.getUserId());
             map.put("param", param);
             return CommonResponseUtil.success(riskSourceService.editRiskSource(map));
         } catch (Exception e) {
@@ -84,7 +87,7 @@ public class RiskModelController extends BaseController {
      * 风险模型删除
      */
     @ApiOperation(httpMethod = "POST", value = "风险模型删除", notes = "风险模型删除")
-    @Authorization(ingore = true)
+    //@Authorization(ingore = true)
     @RequestMapping(value = "/riskSource/deleteRiskSource", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
     public CommonResponse deleteRiskSource(@ApiParam(value = "风险模型id", required = true) @RequestBody Long[] riskSourceId) {
         try {
@@ -116,9 +119,9 @@ public class RiskModelController extends BaseController {
     @RequestMapping(value = "/fmea/editFmea", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
     public CommonResponse editFmea(@ApiParam(value = "Fmea模型对象", required = true) @RequestBody List<Fmea> params) {
         try {
-            User user = getUserInfo();
+        	AgencyUserModel user = getUserInfo();
             HashMap<String, Object> map = new HashMap<>();
-            map.put("user_id", user.getId());
+            map.put("user_id", user.getUserId());
             map.put("fmeas", params);
             fmeaService.editFmea(map);
             RsDataQueue rs = RsDataQueue.getInstance();

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

@@ -9,9 +9,9 @@ import com.yeejoin.amos.fas.business.service.model.FireEquimentDataRo;
 import com.yeejoin.amos.fas.business.service.model.ProtalDataRo;
 import com.yeejoin.amos.fas.core.common.request.CommonPageable;
 import com.yeejoin.amos.fas.core.common.response.RiskSourceTreeResponse;
-import com.yeejoin.amos.op.core.common.response.CommonResponse;
-import com.yeejoin.amos.op.core.util.CommonResponseUtil;
-import com.yeejoin.amos.security.authorization.Authorization;
+import com.yeejoin.amos.fas.core.util.CommonResponse;
+import com.yeejoin.amos.fas.core.util.CommonResponseUtil;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -46,7 +46,7 @@ public class RiskSourceController extends BaseController {
     @Autowired
     IRiskSourceService riskSourceService;
 
-    @Authorization(ingore = true)
+    //@Authorization(ingore = true)
     @ApiOperation(httpMethod = "GET", value = "查询风险点子项", notes = "查询风险点子项")
     @RequestMapping(value = "/children/list", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
     public CommonResponse queryRiskSourceByPage() {
@@ -54,7 +54,7 @@ public class RiskSourceController extends BaseController {
     }
 
 
-    @Authorization(ingore = true)
+    //@Authorization(ingore = true)
     @ApiOperation(httpMethod = "GET", value = "三维图统计", notes = "三维图统计")
     @RequestMapping(value = "/collection3d", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
     public CommonResponse collection3d() {
@@ -102,7 +102,7 @@ public class RiskSourceController extends BaseController {
      *
      * @return
      */
-    @Authorization(ingore = true)
+    //@Authorization(ingore = true)
     @ApiOperation(httpMethod = "GET", value = "获取风险点树型结构", notes = "获取风险点树型结构")
     @RequestMapping(value = "/riskSourceTress", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
     public CommonResponse getRiskSourceTress() {
@@ -110,7 +110,7 @@ public class RiskSourceController extends BaseController {
         return CommonResponseUtil.success(getRiskSourcesTree(riskSources));
     }
 
-    @Authorization(ingore = true)
+    //@Authorization(ingore = true)
     @ApiOperation(httpMethod = "GET", value = "统计级别为1的风险点下面", notes = "获取风险点树型结构")
     @RequestMapping(value = "/query3DStatistics/{markerType}", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
     public CommonResponse query3DStatistics(@PathVariable(value = "markerType", required = true) String markerType) throws Exception {
@@ -133,7 +133,7 @@ public class RiskSourceController extends BaseController {
         return CommonResponseUtil.failure("未定义类型");
     }
 
-    @Authorization(ingore = true)
+    //@Authorization(ingore = true)
     @ApiOperation(httpMethod = "GET", value = "统计级别为1的风险点下面", notes = "获取风险点树型结构")
     @RequestMapping(value = "/riskSourceStatistics", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
     public CommonResponse riskSourceStatistics() throws Exception {
@@ -142,7 +142,7 @@ public class RiskSourceController extends BaseController {
         return CommonResponseUtil.success(riskSourceStatistics(treeRiskSources));
     }
 
-    @Authorization(ingore = true)
+    //@Authorization(ingore = true)
     @ApiOperation(httpMethod = "GET", value = "统计级别为1的风险点下面设备统计", notes = "统计级别为1的风险点下面设备统计")
     @RequestMapping(value = "/equipStatistics", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
     public CommonResponse equipStatistics() throws Exception {
@@ -151,7 +151,7 @@ public class RiskSourceController extends BaseController {
         return CommonResponseUtil.success(riskSourceEquipStatistics(treeRiskSources, true, 0));
     }
 
-    @Authorization(ingore = true)
+    //@Authorization(ingore = true)
     @ApiOperation(httpMethod = "GET", value = "统计级别为1的巡检点统计", notes = "统计级别为1的巡检点统计")
     @RequestMapping(value = "/checkPointStatistics", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
     public CommonResponse riskStatistics() throws Exception {
@@ -271,7 +271,7 @@ public class RiskSourceController extends BaseController {
     }
 
 
-    @Authorization(ingore = true)
+   // @Authorization(ingore = true)
     @ApiOperation(httpMethod = "GET", value = "统计级别为1的风险点下面设备统计", notes = "统计级别为1的风险点下面设备统计")
     @RequestMapping(value = "/equipStatistics/{type}", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
     public CommonResponse equipStatistics(@PathVariable(value = "type", required = true) String[] type) throws Exception {
@@ -541,14 +541,14 @@ public class RiskSourceController extends BaseController {
         return CommonResponseUtil.success(riskSourceService.listEquipmentPointById(fmeaId, importantEquipId, equimentId, equipmentPointName));
     }
 
-    @Authorization(ingore = true)
+   // @Authorization(ingore = true)
     @ApiOperation(httpMethod = "PUT", value = "上传消防设备数据", notes = "上传消防设备数据")
     @RequestMapping(value = "/data/fireqeuiment", produces = "application/json;charset=UTF-8", method = RequestMethod.PUT)
     public CommonResponse postFireEqumentData(@RequestBody FireEquimentDataRo deviceData) throws Exception {
         return CommonResponseUtil.success(riskSourceService.processFireEqumtData(deviceData));
     }
 
-    @Authorization(ingore = true)
+   // @Authorization(ingore = true)
     @ApiOperation(httpMethod = "POST", value = "上传消防设备数据", notes = "上传消防设备数据")
     @RequestMapping(value = "/data/fireqeuiment/soe", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
     public CommonResponse postFireEqumentData(@RequestBody AlarmParam alarm) throws Exception {
@@ -557,7 +557,7 @@ public class RiskSourceController extends BaseController {
         return CommonResponseUtil.success();
     }
 
-    @Authorization(ingore = true)
+   // @Authorization(ingore = true)
     @ApiOperation(httpMethod = "POST", value = "上传消防设备数据", notes = "上传消防设备数据")
     @RequestMapping(value = "/data/fireqeuiment/all", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
     public CommonResponse postFireEqumentData(@RequestBody List<AlarmParam> deviceDatas) throws Exception {
@@ -566,15 +566,15 @@ public class RiskSourceController extends BaseController {
     }
 
 
-    @Authorization(ingore = true)
+    //@Authorization(ingore = true)
     @ApiOperation(httpMethod = "PUT", value = "上传巡检数据", notes = "上传巡检数据")
     @RequestMapping(value = "/data/patroldata", produces = "application/json;charset=UTF-8", method = RequestMethod.PUT)
     public CommonResponse postPatrolData(@RequestBody ProtalDataRo protalData) throws Exception {
-        riskSourceService.processProtalData(protalData);
+        riskSourceService.processProtalData(getToken(),getProduct(),getAppKey(),protalData);
         return CommonResponseUtil.success();
     }
 
-    @Authorization(ingore = true)
+    //@Authorization(ingore = true)
     @ApiOperation(httpMethod = "PUT", value = "上传巡检任务数据", notes = "上传巡检任务数据")
     @RequestMapping(value = "/data/task", produces = "application/json;charset=UTF-8", method = RequestMethod.PUT)
     public CommonResponse postTaskData(@RequestBody ProtalDataRo taskData) throws Exception {
@@ -631,7 +631,7 @@ public class RiskSourceController extends BaseController {
     /**
      * @return
      */
-    @Authorization(ingore = true)
+    //@Authorization(ingore = true)
     @ApiOperation(httpMethod = "POST", value = "设置预案节点自动执行", notes = "设置预案节点自动执行")
     @RequestMapping(value = "/contingency/setup", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
     public CommonResponse queryRiskSourceSecondLevel(@RequestBody ContingencyDeviceStatus contingencyDeviceStatus) {
@@ -639,7 +639,7 @@ public class RiskSourceController extends BaseController {
         return CommonResponseUtil.success();
     }
 
-    @Authorization(ingore = true)
+    //@Authorization(ingore = true)
     @ApiOperation(httpMethod = "GET", value = "初始化預案水資源", notes = "初始化預案水資源")
     @RequestMapping(value = "/contingency/water", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
     public CommonResponse queryContingencyWater() {

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

@@ -6,9 +6,9 @@ import com.yeejoin.amos.fas.business.service.intfc.IContingencyInstance;
 import com.yeejoin.amos.fas.business.service.intfc.IContingencyOriginalDataService;
 import com.yeejoin.amos.fas.core.common.request.CommonPageable;
 import com.yeejoin.amos.fas.core.common.request.CommonRequest;
-import com.yeejoin.amos.op.core.common.response.CommonResponse;
-import com.yeejoin.amos.op.core.util.CommonResponseUtil;
-import com.yeejoin.amos.security.authorization.Authorization;
+import com.yeejoin.amos.fas.core.util.CommonResponse;
+import com.yeejoin.amos.fas.core.util.CommonResponseUtil;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -37,7 +37,7 @@ public class TimeLineController extends BaseController{
     static LinkedList<Map<String,String >> fireQueue  = new LinkedList<>();
 
 
-    @Authorization(ingore = true)
+    //@Authorization(ingore = true)
     @ApiOperation(httpMethod = "GET",value = "根据批次号查询时间轴", notes = "根据批次号查询时间轴")
     @RequestMapping(value = "/{instanceNo}", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
     public CommonResponse queryPoint(@PathVariable String  instanceNo,@RequestParam("recordType") String recordType) throws Exception{
@@ -46,7 +46,7 @@ public class TimeLineController extends BaseController{
     }
 
 
-    @Authorization(ingore = true)
+    //@Authorization(ingore = true)
     @ApiOperation(httpMethod = "PUT",value = "点击按钮", notes = "点击按钮")
     @RequestMapping(value = "/fire", produces = "application/json;charset=UTF-8", method = RequestMethod.PUT)
     public CommonResponse fire(@RequestParam("batchNo") String  batchNo,
@@ -112,7 +112,7 @@ public class TimeLineController extends BaseController{
 
 
 
-    @Authorization(ingore = true)
+   // @Authorization(ingore = true)
     @ApiOperation(httpMethod = "POST",value = "查询预案记录", notes = "查询预案记录")
     @RequestMapping(value = "/contingency/page", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
     public CommonResponse contingencyRecord(

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

@@ -18,11 +18,11 @@ import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.fas.business.service.intfc.ITopographyLineService;
 import com.yeejoin.amos.fas.business.service.intfc.ITopographyNodeDetailService;
 import com.yeejoin.amos.fas.business.service.intfc.ITopographyNodeService;
+import com.yeejoin.amos.fas.core.util.CommonResponse;
+import com.yeejoin.amos.fas.core.util.CommonResponseUtil;
 import com.yeejoin.amos.fas.dao.entity.TopographyLine;
 import com.yeejoin.amos.fas.dao.entity.TopographyNode;
 import com.yeejoin.amos.fas.dao.entity.TopographyNodeDetail;
-import com.yeejoin.amos.op.core.common.response.CommonResponse;
-import com.yeejoin.amos.op.core.util.CommonResponseUtil;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

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

@@ -15,12 +15,13 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.yeejoin.amos.fas.business.service.intfc.IWaterResourceService;
+import com.yeejoin.amos.fas.business.vo.ReginParams;
 import com.yeejoin.amos.fas.core.common.request.CommonPageable;
+import com.yeejoin.amos.fas.core.util.CommonResponse;
+import com.yeejoin.amos.fas.core.util.CommonResponseUtil;
 import com.yeejoin.amos.fas.dao.entity.WaterResource;
 import com.yeejoin.amos.fas.dao.entity.WaterResourceEquipment;
-import com.yeejoin.amos.op.core.common.response.CommonResponse;
-import com.yeejoin.amos.op.core.util.CommonResponseUtil;
-import com.yeejoin.amos.security.authorization.Authorization;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -45,10 +46,11 @@ public class WaterResourceController extends BaseController{
 //                || StringUtils.isEmpty(waterResource.getPosition3d())
                 || StringUtils.isEmpty(waterResource.getCode() ))
             throw new Exception("数据校验失败.");
-
+		ReginParams reginParams =getSelectedOrgInfo();
+		String compCode=getOrgCode(reginParams);
         waterResource.setCreateBy(0);
         waterResource.setCreateDate(new Date());
-        waterResource.setOrgCode(this.getOrgCode());
+        waterResource.setOrgCode(compCode);
         return CommonResponseUtil.success(iWaterResourceService.save(waterResource));
     }
 
@@ -57,11 +59,13 @@ public class WaterResourceController extends BaseController{
     @RequestMapping(value = "/{id}", produces = "application/json;charset=UTF-8", method = RequestMethod.PUT)
     public CommonResponse udpate(@PathVariable Long id, @RequestBody WaterResource waterResource) {
         waterResource.setId(id);
-        waterResource.setOrgCode(this.getOrgCode());
+        ReginParams reginParams =getSelectedOrgInfo();
+		String compCode=getOrgCode(reginParams);
+        waterResource.setOrgCode(compCode);
         return CommonResponseUtil.success(iWaterResourceService.save(waterResource));
     }
 
-    @Authorization(ingore = true)
+ // @Authorization(ingore = true)
     @ApiOperation(httpMethod = "GET",value = "查询单个水资源", notes = "查询单个水资源")
     @RequestMapping(value = "/{id}", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
     public CommonResponse queryPoint(@PathVariable Long id) {
@@ -91,7 +95,7 @@ public class WaterResourceController extends BaseController{
         return CommonResponseUtil.success(iWaterResourceService.queryForPage(StringUtils.trimToNull(name),StringUtils.trimToNull(code),StringUtils.trimToNull(type),commonPageable));
     }
     
-    @Authorization(ingore = true)
+    //@Authorization(ingore = true)
     @ApiOperation(httpMethod = "GET",value = "查询水资源", notes = "分页查询水资源")
     @RequestMapping(value = "/list", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
     public CommonResponse list() {

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/mapper/BizMessageMapper.java

@@ -12,7 +12,7 @@ public interface BizMessageMapper extends BaseMapper {
             @Param("type") String type,
             @Param("title") String title,
             @Param("orgCode") String orgCode,
-            @Param("start") Integer start,
+            @Param("start") long start,
             @Param("length") Integer length);
     Long  queryCountForPage(
             @Param("time") String time,

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/mapper/ContingencyOriginalMapper.java

@@ -16,7 +16,7 @@ public interface ContingencyOriginalMapper extends BaseMapper {
 
 	List<Map> queryForPage( @Param("equipmentId")String equipmentId,
 							@Param("createTime")String  createTime,
-							@Param("start") Integer start,
+							@Param("start") long start,
 							@Param("length") Integer length);
 
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/mapper/FireEquipMapper.java

@@ -34,7 +34,7 @@ public interface FireEquipMapper extends BaseMapper {
             @Param("equipmentName") String equipmentName,
             @Param("startTime") String startTime,
             @Param("endTime") String endTime,
-            @Param("start") int start,
+            @Param("start") long start,
             @Param("length") int length
     );
 
@@ -47,7 +47,7 @@ public interface FireEquipMapper extends BaseMapper {
             @Param("name") String name,
             @Param("code") String code,
             @Param("equipClassify") String equipClassify,
-            @Param("start") int start,
+            @Param("start") long start,
             @Param("length") int length);
 
 
@@ -68,7 +68,7 @@ public interface FireEquipMapper extends BaseMapper {
     List<FireEquipmentEntity> listByType(@Param("type") Integer type);
 
     List<Map> queryEquimentRelation(
-            @Param("start")int start,
+            @Param("start")long start,
             @Param("length")int length,
             @Param("equipmentId") String equipmentId,
             @Param("fname") String fname);

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/mapper/FireEquipPointMapper.java

@@ -13,7 +13,7 @@ public interface FireEquipPointMapper extends BaseMapper {
     Map queryOne(@Param("id") Long id);
 
 
-    List<Map> queryForPage(@Param("fireEqumntId") Long fireEqumntId, @Param("name") String name, @Param("start") Integer start, @Param("length") Integer length);
+    List<Map> queryForPage(@Param("fireEqumntId") Long fireEqumntId, @Param("name") String name, @Param("start") long start, @Param("length") Integer length);
 
     Long queryCountForPage(@Param("fireEqumntId") Long fireEqumntId, @Param("name") String name);
 

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/mapper/FireStationMapper.java

@@ -11,7 +11,7 @@ public interface FireStationMapper extends BaseMapper {
 
     List<Map> queryForFireEqumntPage(
             @Param("fireStationId") Long fireStationId,
-            @Param("start") Integer start,
+            @Param("start") long start,
             @Param("length") Integer length);
     Long  queryCountForFireEqumntPage(
             @Param("fireStationId") Long fireStationId);
@@ -20,7 +20,7 @@ public interface FireStationMapper extends BaseMapper {
     List<Map> queryForPage(@Param("name") String name,
                            @Param("code") String code,
                            @Param("type")String type,
-                           @Param("start") Integer start,
+                           @Param("start") long start,
                            @Param("length") Integer length);
 
     Long  queryCountForPage(@Param("name") String name,

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/mapper/FireStrengthMapper.java

@@ -10,6 +10,6 @@ public interface FireStrengthMapper extends BaseMapper {
     Map queryOne(@Param("id") Long id);
 
 
-    List<Map> queryForPage(@Param("username") String username, @Param("code") String code, @Param("start") Integer start, @Param("length") Integer length);
+    List<Map> queryForPage(@Param("username") String username, @Param("code") String code, @Param("start") long start, @Param("length") Integer length);
     Long  queryCountForPage(@Param("username") String  username, @Param("code") String code);
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/mapper/ImpAndFireEquipMapper.java

@@ -25,7 +25,7 @@ public interface ImpAndFireEquipMapper extends BaseMapper {
      * @param equipmentId
      * @return
      */
-    List<FireEquipment> queryBindFirEqumtPage(@Param("start") int start,@Param("length")int length,@Param("equipmentId") String equipmentId);
+    List<FireEquipment> queryBindFirEqumtPage(@Param("start") long start,@Param("length")int length,@Param("equipmentId") String equipmentId);
 
     Long queryBindFirEqumtPageCount(@Param("equipmentId") String equipmentId);
 

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/mapper/ImpEquipMapper.java

@@ -12,7 +12,7 @@ public interface ImpEquipMapper extends BaseMapper {
 
     List<Map> getEquipPage(@Param("name") String name,
             @Param("id") String id,
-            @Param("offset") Integer offset,
+            @Param("offset") long offset,
             @Param("pageSize") Integer pageSize);
     
     Long getEquipPageCount(@Param("name") String name, @Param("id") String id);

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/mapper/WaterResourceMapper.java

@@ -17,7 +17,7 @@ public interface WaterResourceMapper extends BaseMapper {
             @Param("name") String name,
             @Param("code") String code,
             @Param("type") String  type,
-            @Param("start") Integer start,
+            @Param("start") long start,
             @Param("length") Integer length);
     Long  queryCountForPage(
             @Param("name") String name,
@@ -26,7 +26,7 @@ public interface WaterResourceMapper extends BaseMapper {
     
     List<Map> queryForBindFireEqumntPage(
             @Param("waterResourceId") Long waterResourceId,
-            @Param("start") Integer start,
+            @Param("start") long start,
             @Param("length") Integer length);
     
     Long  queryCountForBindFireEqumntPage(

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/repository/FireStrengthPointDao.java

 package com.yeejoin.amos.fas.business.dao.repository;
 
 import com.yeejoin.amos.fas.dao.entity.FireStrength;
+
+import java.util.Optional;
+
 import org.springframework.stereotype.Repository;
 
 @Repository("fireStrengthPointDao")
 public interface FireStrengthPointDao extends BaseDao<FireStrength, Long> {
 
-	FireStrength findById(Long id);
+	Optional<FireStrength> findById(Long id);
 
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/repository/IContingencyOriginalDataDao.java

 package com.yeejoin.amos.fas.business.dao.repository;
 
 import com.yeejoin.amos.fas.dao.entity.ContingencyOriginalData;
-import com.yeejoin.amos.op.core.jpa.IBaseRepository;
+import com.yeejoin.amos.fas.dao.entity.FireStrength;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
@@ -16,7 +16,7 @@ import org.springframework.transaction.annotation.Transactional;
  * @version $Id: IMessageRepository.java, v 0.1 2018年1月18日 下午7:52:13 HK Exp $
  */
 @Repository
-public interface IContingencyOriginalDataDao extends IBaseRepository<ContingencyOriginalData, String> {
+public interface IContingencyOriginalDataDao  extends BaseDao<ContingencyOriginalData, String> {
 
 
     ContingencyOriginalData findByBatchNo(String batchNo);

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/repository/IContingencyPlanInstanceRepository.java

 package com.yeejoin.amos.fas.business.dao.repository;
 
 import com.yeejoin.amos.fas.dao.entity.ContingencyPlanInstance;
-import com.yeejoin.amos.op.core.jpa.IBaseRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Optional;
 
 /**
  * <pre>
@@ -16,7 +16,7 @@ import java.util.List;
  * @version $Id: IMessageRepository.java, v 0.1 2018年1月18日 下午7:52:13 HK Exp $
  */
 @Repository
-public interface IContingencyPlanInstanceRepository extends IBaseRepository<ContingencyPlanInstance, String> {
+public interface IContingencyPlanInstanceRepository extends BaseDao<ContingencyPlanInstance, String> {
     int countByBatchNo(String batchNo);
 
 
@@ -46,5 +46,5 @@ public interface IContingencyPlanInstanceRepository extends IBaseRepository<Cont
                     " order by t.sort desc ", nativeQuery = true)
     List<ContingencyPlanInstance> queryForContent(String batch_no,String category,String subCategory);
     
-    ContingencyPlanInstance findById(String id);
+    Optional<ContingencyPlanInstance> findById(String id);
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/repository/IDeptmentDao.java

-package com.yeejoin.amos.fas.business.dao.repository;
+/*package com.yeejoin.amos.fas.business.dao.repository;
 
 import com.yeejoin.amos.fas.dao.entity.SDepartment;
 import org.springframework.data.jpa.repository.Query;
@@ -9,5 +9,6 @@ import java.util.List;
 @Repository("deptmentDao")
 public interface IDeptmentDao extends BaseDao<SDepartment, Long> {
     @Query("select u from SDepartment u where u.isDelete = ?2 and u.companyId = ?1")
-    public List<SDepartment> findDeptmentByCompanyId(Long companyId, byte isDel);
+    public List<SDepartment> findDeptmentByCompanyId(String companyId, byte isDel);
 }
+*/
\ No newline at end of file

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/repository/IEquipmentDao.java

 package com.yeejoin.amos.fas.business.dao.repository;
 
+import java.util.Optional;
+
 import org.springframework.stereotype.Repository;
 
 import com.yeejoin.amos.fas.business.vo.EquipCommunicationData;
@@ -8,6 +10,6 @@ import com.yeejoin.amos.fas.dao.entity.Equipment;
 @Repository("iEquipmentDao")
 public interface IEquipmentDao extends BaseDao<Equipment, Long> {
 
-	Equipment findById(Long id);
+	Optional<Equipment> findById(Long id);
 
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/repository/IFireCarDao.java

 package com.yeejoin.amos.fas.business.dao.repository;
 
+import java.util.Optional;
+
 import org.springframework.stereotype.Repository;
 
 import com.yeejoin.amos.fas.dao.entity.FireCar;
 
 @Repository("iFireCarDao")
 public interface IFireCarDao extends BaseDao<FireCar, Long> {
-	FireCar findById(Long id);
+	Optional<FireCar> findById(Long id);
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/repository/IFireEquipmentDao.java

 package com.yeejoin.amos.fas.business.dao.repository;
 
 import java.util.List;
+import java.util.Optional;
 
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
@@ -13,6 +14,6 @@ public interface IFireEquipmentDao extends BaseDao<FireEquipment, Long> {
 	@Query(value = "select distinct production_area from f_fire_equipment ",nativeQuery = true)
 	List<String> findFireEquipArea();
 	
-	FireEquipment findById(Long id);
+	Optional<FireEquipment> findById(Long id);
 
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/repository/IFireEquipmentDataDao.java

 package com.yeejoin.amos.fas.business.dao.repository;
 
+import java.util.Optional;
+
 import org.springframework.stereotype.Repository;
 
 import com.yeejoin.amos.fas.dao.entity.FireEquipmentData;
@@ -7,7 +9,7 @@ import com.yeejoin.amos.fas.dao.entity.FireEquipmentData;
 @Repository("iFireEquipmentDataDao")
 public interface IFireEquipmentDataDao extends BaseDao<FireEquipmentData, Long> {
 
-	FireEquipmentData findById(Long id);
+	Optional<FireEquipmentData> findById(Long id);
 
 
 

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/repository/IFireEquipmentPointDao.java

 package com.yeejoin.amos.fas.business.dao.repository;
 
+import java.util.Optional;
+
 import org.springframework.stereotype.Repository;
 
 import com.yeejoin.amos.fas.dao.entity.FireEquipmentPoint;
@@ -7,7 +9,7 @@ import com.yeejoin.amos.fas.dao.entity.FireEquipmentPoint;
 @Repository("iFireEquipmentPointDao")
 public interface IFireEquipmentPointDao extends BaseDao<FireEquipmentPoint, Long> {
 
-	FireEquipmentPoint findById(Long id);
+	Optional<FireEquipmentPoint> findById(Long id);
 
 	FireEquipmentPoint findOneByCode(String pointCode);
 

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/repository/IFireStationDao.java

 package com.yeejoin.amos.fas.business.dao.repository;
 
+import java.util.Optional;
+
 import org.springframework.stereotype.Repository;
 
 import com.yeejoin.amos.fas.dao.entity.FireStation;
@@ -7,6 +9,6 @@ import com.yeejoin.amos.fas.dao.entity.FireStation;
 @Repository("iFireStationDao")
 public interface IFireStationDao extends BaseDao<FireStation, Long> {
 
-	FireStation findById(Long id);
+	Optional<FireStation> findById(Long id);
 
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/repository/IFmeaDao.java

 package com.yeejoin.amos.fas.business.dao.repository;
 
 import java.util.List;
+import java.util.Optional;
 
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
@@ -37,7 +38,7 @@ public interface IFmeaDao extends BaseDao<Fmea, Long> {
 	void deleteById(Long[] fmeaIds);
 
 
-	Fmea findById(Long id);
+	Optional<Fmea> findById(Long id);
 
 	@Query(value = "SELECT count(1) FROM `f_fmea_point_inputitem` WHERE fmea_id in ?1", nativeQuery = true)
     int countAssociatedInputItemByIds(String[] ids);

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/repository/INodeMsgViewRepository.java

 package com.yeejoin.amos.fas.business.dao.repository;
 
 import com.yeejoin.amos.fas.dao.entity.NodeMessageView;
-import com.yeejoin.amos.op.core.jpa.IBaseRepository;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -14,7 +13,7 @@ import org.springframework.stereotype.Repository;
  * @version $Id: INodeMsgViewRepository.java, v 0.1 2019年1月2日 下午2:47:13 amos Exp $
  */
 @Repository
-public interface INodeMsgViewRepository extends IBaseRepository<NodeMessageView, String>
+public interface INodeMsgViewRepository extends BaseDao<NodeMessageView, String>
 {
 
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/repository/IPPointDao.java

@@ -5,8 +5,9 @@ import com.yeejoin.amos.fas.dao.entity.RiskSource;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Optional;
 
 @Repository("iPPointDao")
 public interface IPPointDao extends BaseDao<PPoint, Long> {
-	PPoint findById(Long id);
+	Optional<PPoint> findById(Long id);
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/repository/IRiskFactorDao.java

 package com.yeejoin.amos.fas.business.dao.repository;
 
 import java.util.List;
+import java.util.Optional;
 
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
@@ -19,6 +20,6 @@ public interface IRiskFactorDao extends BaseDao<RiskFactor, Long> {
 	@Query(value="delete from f_risk_factor where id in (?1)", nativeQuery = true)
 	void deleteAllByIds(Long[] param);
 	
-	RiskFactor findById(Long id);
+	Optional<RiskFactor> findById(Long id);
 
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/repository/IRiskLevelDao.java

 package com.yeejoin.amos.fas.business.dao.repository;
 
 import java.util.List;
+import java.util.Optional;
 
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
@@ -19,5 +20,5 @@ public interface IRiskLevelDao extends BaseDao<RiskLevel, Long> {
 	@Query(value="delete from f_risk_level where id in (?1)", nativeQuery = true)
 	void deleteAllByIds(Long[] param);
 	
-	RiskLevel findById(Long id);
+	Optional<RiskLevel> findById(Long id);
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/repository/IRiskSourceDao.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.fas.business.dao.repository;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
@@ -21,7 +22,7 @@ public interface IRiskSourceDao extends BaseDao<RiskSource, Long> {
 	
 	int countByParentId(Long parentId);
 	
-	RiskSource findById(Long id);
+	Optional<RiskSource> findById(Long id);
 	
 	
 	/**

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/repository/IUserDao.java

-package com.yeejoin.amos.fas.business.dao.repository;
+/*package com.yeejoin.amos.fas.business.dao.repository;
 
 import com.yeejoin.amos.fas.dao.entity.SUser;
 import org.springframework.data.jpa.repository.Query;
@@ -15,3 +15,4 @@ public interface IUserDao extends BaseDao<SUser, Long> {
     List<SUser> findAllUser();
 }
 
+*/
\ No newline at end of file

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/repository/IWaterResourceDao.java

 package com.yeejoin.amos.fas.business.dao.repository;
 
 import com.yeejoin.amos.fas.dao.entity.WaterResource;
+
+import java.util.Optional;
+
 import org.springframework.stereotype.Repository;
 
 @Repository("iWaterResourceDao")
 public interface IWaterResourceDao extends BaseDao<WaterResource, Long> {
 
-	WaterResource findById(Long id);
+	Optional<WaterResource> findById(Long id);
 
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/repository/IWaterResourceEquipmentDao.java

 package com.yeejoin.amos.fas.business.dao.repository;
 
 import java.util.List;
+import java.util.Optional;
 
 import org.springframework.stereotype.Repository;
 
@@ -9,7 +10,7 @@ import com.yeejoin.amos.fas.dao.entity.WaterResourceEquipment;
 @Repository("iWaterResourceEquipmentDao")
 public interface IWaterResourceEquipmentDao extends BaseDao<WaterResourceEquipment, Long> {
 
-	WaterResourceEquipment findById(Long id);
+	Optional<WaterResourceEquipment> findById(Long id);
 	
 	WaterResourceEquipment findByWaterResourceIdAndFireEquipmentId(Long waterResourceId,Long fireEquipmentId);
 	

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/feign/AMOSSecurityFallback.java

-package com.yeejoin.amos.fas.business.feign;
+/*package com.yeejoin.amos.fas.business.feign;
 
 import com.yeejoin.amos.op.core.common.response.CommonResponse;
 
@@ -33,3 +33,4 @@ public class AMOSSecurityFallback implements IAMOSSecurityServer{
 	}
 
 }
+*/
\ No newline at end of file

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/feign/CompanyUserFeignServer.java

-package com.yeejoin.amos.fas.business.feign;
+/*package com.yeejoin.amos.fas.business.feign;
 
 import java.util.concurrent.CountDownLatch;
 
@@ -46,3 +46,4 @@ public class CompanyUserFeignServer extends Thread{
 	
 	
 }
+*/
\ No newline at end of file

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/feign/DeptmentServer.java

-package com.yeejoin.amos.fas.business.feign;
+/*package com.yeejoin.amos.fas.business.feign;
 
 import java.util.concurrent.CountDownLatch;
 
@@ -38,3 +38,4 @@ public class DeptmentServer extends Thread{
 		latch.countDown();
 	}
 }
+*/
\ No newline at end of file

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/feign/IAMOSSecurityServer.java

-package com.yeejoin.amos.fas.business.feign;
+/*package com.yeejoin.amos.fas.business.feign;
 
-import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -22,3 +22,4 @@ public interface IAMOSSecurityServer {
 	@RequestMapping(value = "/company/specify-tree/{companyId}", method = RequestMethod.GET)
 	public CommonResponse queryCompanyLeavesById(@PathVariable("companyId") String companyId);
 }
+*/
\ No newline at end of file

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/feign/IMaasVisualServer.java

 package com.yeejoin.amos.fas.business.feign;
 
-import com.yeejoin.amos.op.core.common.response.CommonResponse;
-import org.springframework.cloud.netflix.feign.FeignClient;
+
+import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
+import com.yeejoin.amos.fas.core.util.CommonResponse;
+
 @FeignClient(name="${visual.fegin.name}", fallback=MassVisualFallback.class, configuration=FeignConfiguration.class)
 public interface IMaasVisualServer {
 	@RequestMapping(value = "/tree/subject/findAll", method = RequestMethod.GET)

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/feign/MassVisualFallback.java

 package com.yeejoin.amos.fas.business.feign;
 
-import com.yeejoin.amos.op.core.common.response.CommonResponse;
+import com.yeejoin.amos.fas.core.util.CommonResponse;
 
 public class MassVisualFallback implements IMaasVisualServer{
 

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/feign/RemoteRuleServer.java

@@ -3,13 +3,16 @@ package com.yeejoin.amos.fas.business.feign;
 import com.yeejoin.amos.fas.business.service.model.BasicsRo;
 import com.yeejoin.amos.fas.business.service.model.ContingencyDeviceStatus;
 import com.yeejoin.amos.fas.business.service.model.RiskSourceRuleRo;
-import com.yeejoin.amos.op.core.util.ApplicationConfig;
-import com.yeejoin.amos.op.core.util.Constants;
-import com.yeejoin.amos.op.core.util.JSONUtil;
+//import com.yeejoin.amos.op.core.util.ApplicationConfig;
+//import com.yeejoin.amos.op.core.util.Constants;
+import com.yeejoin.amos.fas.business.util.Constants;
+import com.yeejoin.amos.fas.business.util.JSONUtil;
+
 import org.codehaus.jackson.map.ObjectMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
@@ -32,8 +35,10 @@ import java.util.Map;
 @Service("remoteRuleServer")
 public class RemoteRuleServer {
 
-    @Autowired
-    private ApplicationConfig applicationConfig;
+   /* @Autowired
+    private ApplicationConfig applicationConfig;*/
+	@Value("${params.remoteRuleUrl}")
+    private String remoteRuleUrl;
     
     private final RestTemplate restTemplate;
 
@@ -55,7 +60,8 @@ public class RemoteRuleServer {
         map.put("resFact", data);
         map.put("packageId", packageId);
         map.put("className", riskSourceRuleRo.getClass().getName());
-        String url = applicationConfig.getParamValueStr("params.remoteRuleUrl");
+        /*String url = applicationConfig.getParamValueStr("params.remoteRuleUrl");*/
+        String url =remoteRuleUrl;
         HttpHeaders headers = new HttpHeaders();
         MediaType type = MediaType.parseMediaType("application/json; charset=UTF-8");
         headers.setContentType(type);
@@ -91,8 +97,8 @@ public class RemoteRuleServer {
         map.put("packageId", packageId);
         map.put("processId", processId);
         map.put("className", resFact.getClass().getName());
-        String url = applicationConfig.getParamValueStr("params.remoteRuleUrl");
-
+        //String url = applicationConfig.getParamValueStr("params.remoteRuleUrl");
+        String url =remoteRuleUrl;
         HttpHeaders headers = new HttpHeaders();
         MediaType type = MediaType
                 .parseMediaType("application/json; charset=UTF-8");
@@ -114,8 +120,9 @@ public class RemoteRuleServer {
     public Object autoProcessContingency(ContingencyDeviceStatus contingencyDeviceStatus) throws Exception {
         Map<String, String> map = new HashMap<String, String>();
 
-        String url = applicationConfig.getParamValueStr("params.remoteRuleUrl");
-//        String url = "http://172.16.10.70:8080/";
+       // String url = applicationConfig.getParamValueStr("params.remoteRuleUrl");
+        String url =remoteRuleUrl;
+        //        String url = "http://172.16.10.70:8080/";
         HttpHeaders headers = new HttpHeaders();
         MediaType type = MediaType
                 .parseMediaType("application/json; charset=UTF-8");

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/feign/RemoteWebSocketServer.java

@@ -5,6 +5,7 @@ import java.util.Map;
 
 import org.codehaus.jackson.map.ObjectMapper;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
@@ -13,13 +14,18 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
-import com.yeejoin.amos.op.core.util.ApplicationConfig;
-import com.yeejoin.amos.op.core.util.Constants;
+import com.yeejoin.amos.fas.business.util.Constants;
+
+
 
 @Service("remoteWebSocketServer")
 public class RemoteWebSocketServer {
-	@Autowired
-    private ApplicationConfig applicationConfig;
+	/*@Autowired
+    private ApplicationConfig applicationConfig;*/
+	
+	@Value("${params.remoteWebsocketUrl}")
+    private String remoteRuleUrl;
+	
     private final RestTemplate restTemplate;
 
     private ObjectMapper objectMapper = new ObjectMapper();
@@ -35,7 +41,9 @@ public class RemoteWebSocketServer {
         map.put("filter", null);
         map.put("message", message);
         map.put("path", path);
-        String url = applicationConfig.getParamValueStr("params.remoteWebsocketUrl");
+        //String url = applicationConfig.getParamValueStr("params.remoteWebsocketUrl");
+        String url =remoteRuleUrl;
+        
         HttpHeaders headers = new HttpHeaders();
         MediaType type = MediaType
                 .parseMediaType("application/json; charset=UTF-8");

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/feign/TreeUserFeignServer.java

-package com.yeejoin.amos.fas.business.feign;
+/*package com.yeejoin.amos.fas.business.feign;
 
 import java.util.concurrent.CountDownLatch;
 
@@ -41,3 +41,4 @@ public class TreeUserFeignServer extends Thread{
 	}
 	
 }
+*/
\ No newline at end of file

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/CommonService.java

 package com.yeejoin.amos.fas.business.service.impl;
 
 import com.yeejoin.amos.fas.business.dao.mapper.CommonMapper;
-import com.yeejoin.amos.fas.business.dao.repository.IDeptmentDao;
-import com.yeejoin.amos.fas.business.dao.repository.IUserDao;
+import com.yeejoin.amos.fas.business.feign.RemoteSecurityService;
 import com.yeejoin.amos.fas.business.param.PointListParam;
 import com.yeejoin.amos.fas.business.service.intfc.ICommonService;
-import com.yeejoin.amos.fas.dao.entity.SDepartment;
-import com.yeejoin.amos.fas.dao.entity.SUser;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
@@ -18,18 +18,23 @@ import java.util.List;
 @Service("commonService")
 public class CommonService implements ICommonService {
 
-    @Autowired
+   /* @Autowired
     private IDeptmentDao deptmentDao;
-
+*/
     @Autowired
     private CommonMapper commonMapper;
     
     @Autowired
-    private IUserDao userDao;
+    private RemoteSecurityService remoteSecurityService;
+
+   /* @Autowired
+    private IUserDao userDao;*/
 
     @Override
-    public List<SDepartment> getDepartment(Long companyId) {
-        return deptmentDao.findDeptmentByCompanyId(Long.valueOf(companyId), (byte) 0);
+    public List<DepartmentModel> getDepartment(String toke,String product,String appKey,String companyId) {
+    	
+    	List<DepartmentModel> list=remoteSecurityService.getDepartmentTreeByCompanyId(toke, product, appKey, companyId);
+        return list;
     }
 
     @Override
@@ -49,12 +54,16 @@ public class CommonService implements ICommonService {
     }
 
     @Override
-    public List<SUser> getUsers(Long departmentId) {
-        return userDao.findUserByDeptmentId(new Long(departmentId.toString()), (byte) 0);
+    public List<AgencyUserModel> getUsers(String toke,String product,String appKey,String departmentId) {
+    	
+    	 List<AgencyUserModel>  list=remoteSecurityService.listUserByDepartmentId(toke, product, appKey, departmentId);
+        return list;
     }
 
     @Override
-    public List<SUser> getAllUser() {
-        return userDao.findAllUser();
+    public List<AgencyUserModel> getAllUser(String toke,String product,String appKey,String orgCode) {
+    	
+    	 List<AgencyUserModel>  list=remoteSecurityService.listUserByOrgCode(toke, product, appKey,orgCode);
+        return list;
     }
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/ContingencyInstanceImpl.java

@@ -11,7 +11,6 @@ import com.yeejoin.amos.fas.business.service.model.OperateGroup;
 import com.yeejoin.amos.fas.dao.entity.ContingencyOriginalData;
 import com.yeejoin.amos.fas.dao.entity.ContingencyPlanInstance;
 import com.yeejoin.amos.fas.dao.entity.Equipment;
-import com.yeejoin.amos.op.core.jpa.GenericManagerImpl;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -30,12 +29,15 @@ import org.typroject.tyboot.component.cache.Redis;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 @Service
-public class ContingencyInstanceImpl extends GenericManagerImpl<ContingencyPlanInstance, String> implements IContingencyInstance {
+public class ContingencyInstanceImpl /*extends GenericManagerImpl<ContingencyPlanInstance, String>*/ implements IContingencyInstance {
 
     private static final Logger log = LoggerFactory.getLogger(ContingencyInstanceImpl.class);
-    IContingencyPlanInstanceRepository repository;
+    
+    @Autowired
+    private IContingencyPlanInstanceRepository repository;
 
 
     @Autowired
@@ -62,10 +64,10 @@ public class ContingencyInstanceImpl extends GenericManagerImpl<ContingencyPlanI
     private static Map<String, String> stepMap = new HashMap<>();
 
 
-    public ContingencyInstanceImpl(IContingencyPlanInstanceRepository repository) {
+   /* public ContingencyInstanceImpl(IContingencyPlanInstanceRepository repository) {
         super(repository);
         this.repository = repository;
-    }
+    }*/
 
 
     /**
@@ -101,7 +103,7 @@ public class ContingencyInstanceImpl extends GenericManagerImpl<ContingencyPlanI
      * @throws Exception
      */
     public List<ContingencyPlanInstance> queryForTimeLine(String instanceNo, String recordType) throws Exception {
-        List<ContingencyPlanInstance> categorys = this.repository.queryForCategory(instanceNo, recordType);
+        List<ContingencyPlanInstance> categorys = repository.queryForCategory(instanceNo, recordType);
         return categorys;
     }
 
@@ -180,8 +182,11 @@ public class ContingencyInstanceImpl extends GenericManagerImpl<ContingencyPlanI
 
     public void setButtonExecuted(String batchNo, String contingencyPlanId, String code, String buttonState) throws Exception {
         ObjectMapper objectMapper = new ObjectMapper();
-        ContingencyPlanInstance contingencyPlanInstance = this.repository.findById(contingencyPlanId);
+        Optional<ContingencyPlanInstance> contingencyPlanInstance1 = repository.findById(contingencyPlanId);
+       
+        ContingencyPlanInstance  contingencyPlanInstance=contingencyPlanInstance1.get();
         
+        if(contingencyPlanInstance1.isPresent()){
         	  if (contingencyPlanInstance != null && "OPERATE".equals(contingencyPlanInstance.getRecordType())) {
                   String operateJson = contingencyPlanInstance.getContent();
                   OperateGroup operateGroup = objectMapper.readValue(operateJson, OperateGroup.class);
@@ -215,13 +220,19 @@ public class ContingencyInstanceImpl extends GenericManagerImpl<ContingencyPlanI
                       contingencyPlanInstance.setRunstate(true);
                   operateJson = objectMapper.writeValueAsString(operateGroup);
                   contingencyPlanInstance.setContent(operateJson);
-            this.repository.save(contingencyPlanInstance);
+                  repository.save(contingencyPlanInstance);
               }
         }
      
+    }
+
     public void setButtonWait(String batchNo, String contingencyPlanId, String buttonState) throws Exception {
         ObjectMapper objectMapper = new ObjectMapper();
-        ContingencyPlanInstance contingencyPlanInstance = this.repository.findById(contingencyPlanId);
+        Optional<ContingencyPlanInstance> contingencyPlanInstance1 = repository.findById(contingencyPlanId);
+        ContingencyPlanInstance contingencyPlanInstance=null;
+        if(contingencyPlanInstance1.isPresent()){
+        	contingencyPlanInstance=contingencyPlanInstance1.get();
+       }
         
         if (contingencyPlanInstance != null && "OPERATE".equals(contingencyPlanInstance.getRecordType())) {
             String operateJson = contingencyPlanInstance.getContent();
@@ -242,7 +253,7 @@ public class ContingencyInstanceImpl extends GenericManagerImpl<ContingencyPlanI
                 contingencyPlanInstance.setRunstate(true);
             operateJson = objectMapper.writeValueAsString(operateGroup);
             contingencyPlanInstance.setContent(operateJson);
-            this.repository.save(contingencyPlanInstance);
+            repository.save(contingencyPlanInstance);
         }
     }
 

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/ContingencyOriginalServiceImpl.java

@@ -5,8 +5,6 @@ import com.yeejoin.amos.fas.business.dao.repository.IContingencyOriginalDataDao;
 import com.yeejoin.amos.fas.business.service.intfc.IContingencyOriginalDataService;
 import com.yeejoin.amos.fas.core.common.request.CommonPageable;
 import com.yeejoin.amos.fas.dao.entity.ContingencyOriginalData;
-import com.yeejoin.amos.op.core.jpa.GenericManagerImpl;
-import liquibase.exception.DatabaseException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
@@ -18,25 +16,26 @@ import java.util.List;
 import java.util.Map;
 
 @Service
-public class ContingencyOriginalServiceImpl extends GenericManagerImpl<ContingencyOriginalData, String> implements IContingencyOriginalDataService
+public class ContingencyOriginalServiceImpl /*extends GenericManagerImpl<ContingencyOriginalData, String>*/ implements IContingencyOriginalDataService
 {
-	IContingencyOriginalDataDao repository;
+	    @Autowired
+	    private IContingencyOriginalDataDao repository;
 
 	@Autowired
 	private ContingencyOriginalMapper contingencyOriginalMapper;
 
-	public ContingencyOriginalServiceImpl(IContingencyOriginalDataDao repository)
+	/*public ContingencyOriginalServiceImpl(IContingencyOriginalDataDao repository)
 	{
 		super(repository);
 		this.repository = repository;
-	}
+	}*/
 
 
 
 
 	public ContingencyOriginalData queryByBatchNo(String batchNo)
 	{
-		return this.repository.findByBatchNo(batchNo);
+		return repository.findByBatchNo(batchNo);
 	}
 
 

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/DictServiceImpl.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.fas.business.service.impl;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Optional;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -35,23 +36,29 @@ public class DictServiceImpl implements IDictService {
 	public List<Dict> getDictListByIds(Long[] ids) {
 		List<Long> resultList = new ArrayList<>(ids.length);
 		Collections.addAll(resultList, ids);
-		return dictDao.findAll(resultList);
+		return dictDao.findAllById(resultList);
 	}
 
 	@Override
 	public Dict getDictById(long id) {
-		return dictDao.findOne(id);
+		
+		Optional<Dict> dict1=dictDao.findById(id);
+		Dict  dict=null;
+		if(dict1.isPresent()){
+			dict=dict1.get();
+		}
+		return dict;
 	}
 
 	@Override
 	public void deleteDictById(long id) {
-		dictDao.delete(id);
+		dictDao.deleteById(id);
 	}
 
 	@Override
 	public void deleteDictByIds(long[] ids) {
 		for (long id : ids) {
-			dictDao.delete(id);
+			dictDao.deleteById(id);
 		}	
 	}
 

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/EquipmentServiceImpl.java

@@ -16,13 +16,14 @@ import com.yeejoin.amos.fas.business.service.intfc.IEquipmentService;
 import com.yeejoin.amos.fas.business.vo.EquipCommunicationData;
 import com.yeejoin.amos.fas.core.common.request.CommonPageable;
 import com.yeejoin.amos.fas.core.common.response.EquipDetailsResponse;
+import com.yeejoin.amos.fas.core.util.DaoCriteria;
 import com.yeejoin.amos.fas.core.util.query.BaseQuerySpecification;
+import com.yeejoin.amos.fas.dao.entity.Dict;
 import com.yeejoin.amos.fas.dao.entity.Equipment;
 import com.yeejoin.amos.fas.dao.entity.EquipmentFireEquipment;
 import com.yeejoin.amos.fas.dao.entity.FireEquipment;
 import com.yeejoin.amos.fas.dao.entity.PreplanPicture;
 import com.yeejoin.amos.fas.exception.YeeException;
-import com.yeejoin.amos.op.core.common.query.DaoCriteria;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -50,6 +51,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 @Service("equipService")
 public class EquipmentServiceImpl implements IEquipmentService {
@@ -111,14 +113,30 @@ public class EquipmentServiceImpl implements IEquipmentService {
 
 
     public Equipment queryOne(Long id) {
-        return iEquipmentDao.findById(id);
+    	
+    	Optional<Equipment> dict1=iEquipmentDao.findById(id);
+    	Equipment  dict=null;
+		if(dict1.isPresent()){
+			dict=dict1.get();
+		}
+		return dict;
+       
     }
 
     public String[] delete(String[] idArray) throws Exception {
         for (String id : idArray) {
-            Equipment equipment = iEquipmentDao.findById(Long.parseLong(id));
+            Optional<Equipment> equipment1 = iEquipmentDao.findById(Long.parseLong(id));
+            
+         
+        	Equipment  equipment=null;
+    		if(equipment1.isPresent()){
+    			equipment=equipment1.get();
+    		}
+    	
+            
+            
             if (equipment != null) {
-                this.iEquipmentDao.delete(Long.parseLong(id));
+                this.iEquipmentDao.deleteById(Long.parseLong(id));
                 node3dVoMapper.incrementalDeleteImpEqumt(Long.parseLong(id));
             } else {
                 throw new Exception("找不到指定的对象:" + id);
@@ -210,7 +228,7 @@ public class EquipmentServiceImpl implements IEquipmentService {
 
             if (equipmentFireEquipment != null) {
                 result = equipmentFireEquipment.getId();
-                this.equipmentFireEquipmentDao.delete(equipmentFireEquipment.getId());
+                this.equipmentFireEquipmentDao.deleteById(equipmentFireEquipment.getId());
             }
             ids.add(result);
         }
@@ -226,7 +244,7 @@ public class EquipmentServiceImpl implements IEquipmentService {
      * @return
      */
     public Page queryBindFirEqumtList(CommonPageable commonPageable, Long equipmentId) {
-        int start = -1;
+    	long start = -1;
         int length = -1;
         if (null != commonPageable) {
             start = commonPageable.getOffset();
@@ -277,7 +295,12 @@ public class EquipmentServiceImpl implements IEquipmentService {
         pp.setCreateBy(userId.intValue());
         pp.setPicture(picture);
         if (equipment.getCreateDate() == null) {
-            equipment.setCreateDate(iEquipmentDao.findById(equipment.getId()).getCreateDate());
+        	Optional<Equipment>  date=iEquipmentDao.findById(equipment.getId());
+        	Equipment  equipment2=null;
+    		if(date.isPresent()){
+    			equipment2=date.get();
+    		}
+           equipment.setCreateDate(equipment2.getCreateDate());
         }
 
         preplanPictureDao.saveAndFlush(pp);
@@ -302,12 +325,26 @@ public class EquipmentServiceImpl implements IEquipmentService {
         if (imgs == null || imgs.length < 1) {
             equipment = save(equipment);
             if (equipment.getCreateDate() == null) {
-                equipment.setCreateDate(iEquipmentDao.findById(equipment.getId()).getCreateDate() == null ? new Date() : iEquipmentDao.findById(equipment.getId()).getCreateDate());
+            	
+            	Optional<Equipment>  date=iEquipmentDao.findById(equipment.getId());
+            	Equipment  equipment2=null;
+        		if(date.isPresent()){
+        			equipment2=date.get();
+        		}
+            	
+                equipment.setCreateDate(equipment2.getCreateDate() == null ? new Date() : equipment2.getCreateDate());
             }
         } else {
             equipment = save(equipment);
             if (equipment.getCreateDate() == null) {
-                equipment.setCreateDate(iEquipmentDao.findById(equipment.getId()).getCreateDate() == null ? new Date() : iEquipmentDao.findById(equipment.getId()).getCreateDate());
+            	
+            	Optional<Equipment>  date=iEquipmentDao.findById(equipment.getId());
+            	Equipment  equipment2=null;
+        		if(date.isPresent()){
+        			equipment2=date.get();
+        		}
+            	
+                equipment.setCreateDate(equipment2.getCreateDate() == null ? new Date() : equipment2.getCreateDate());
             }
             Long equipmentId = Long.valueOf(equipment.getId());
             for (int i = 0; i < imgs.length; i++) {

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/ExcelServiceImpl.java

@@ -13,8 +13,8 @@ import com.yeejoin.amos.fas.business.param.FireEquipmentPointParam;
 import com.yeejoin.amos.fas.business.param.WaterResourceParam;
 import com.yeejoin.amos.fas.business.service.intfc.IExcelService;
 import com.yeejoin.amos.fas.business.service.intfc.IFireEquipPontService;
+import com.yeejoin.amos.fas.core.util.CommonResponse;
 import com.yeejoin.amos.fas.dao.entity.WaterResource;
-import com.yeejoin.amos.op.core.common.response.CommonResponse;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageImpl;

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/FireCarServiceImpl.java

@@ -5,6 +5,7 @@ import java.io.IOException;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Optional;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -57,17 +58,29 @@ public class FireCarServiceImpl implements IFireCarService {
 
 	public FireCar queryOne(Long id)
 	{
-		return iFireCarDao.findById(id);
+		Optional<FireCar> FireCar1=	iFireCarDao.findById(id);
+		FireCar fireCar=null;
+		if(FireCar1.isPresent()){
+			fireCar=FireCar1.get();
+		}
+		return fireCar;
 	}
 
 	public String [] delete(String []idArray) throws Exception
 	{
 		for(String id:idArray)
 		{
-			FireCar fireCar = iFireCarDao.findById(Long.parseLong(id));
+			Optional<FireCar> fireCar1 = iFireCarDao.findById(Long.parseLong(id));
+			
+			FireCar fireCar=null;
+			if(fireCar1.isPresent()){
+				fireCar=fireCar1.get();
+			}
+		
+			
 			if(fireCar != null)
 			{
-				this.iFireCarDao.delete(Long.parseLong(id));
+				this.iFireCarDao.deleteById(Long.parseLong(id));
 				node3dVoMapper.incrementalDeleteFireCar(Long.parseLong(id));
 			}else
 			{

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/FireEquipPointServiceImpl.java

@@ -9,10 +9,11 @@ import com.yeejoin.amos.fas.business.service.intfc.IEquipmentService;
 import com.yeejoin.amos.fas.business.service.intfc.IFireEquipPontService;
 import com.yeejoin.amos.fas.business.vo.EquipCommunicationData;
 import com.yeejoin.amos.fas.core.common.request.CommonPageable;
+import com.yeejoin.amos.fas.core.util.CommonResponse;
+import com.yeejoin.amos.fas.core.util.CommonResponseUtil;
+import com.yeejoin.amos.fas.core.util.StringUtil;
+import com.yeejoin.amos.fas.dao.entity.FireCar;
 import com.yeejoin.amos.fas.dao.entity.FireEquipmentPoint;
-import com.yeejoin.amos.op.core.common.response.CommonResponse;
-import com.yeejoin.amos.op.core.util.CommonResponseUtil;
-import com.yeejoin.amos.op.core.util.StringUtil;
 import org.assertj.core.util.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -21,6 +22,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 @Service("fireEquipPoint")
 public class FireEquipPointServiceImpl implements IFireEquipPontService {
@@ -44,14 +46,25 @@ public class FireEquipPointServiceImpl implements IFireEquipPontService {
 
 
     public FireEquipmentPoint queryOne(Long id) {
-        return fireEquipmentPointDao.findOne(id);
+    	Optional<FireEquipmentPoint> fireCar1= fireEquipmentPointDao.findById(id);
+        FireEquipmentPoint fireCar=null;
+		if(fireCar1.isPresent()){
+			fireCar=fireCar1.get();
+		}
+		return fireCar;
     }
 
     public String[] deletePoint(String[] idArray) throws Exception {
         for (String id : idArray) {
-            FireEquipmentPoint fireEquipmentPoint = fireEquipmentPointDao.findById(Long.parseLong(id));
+            Optional<FireEquipmentPoint> fireEquipmentPoint1 = fireEquipmentPointDao.findById(Long.parseLong(id));
+            FireEquipmentPoint fireEquipmentPoint=null;
+            
+            if(fireEquipmentPoint1.isPresent()){
+            	fireEquipmentPoint=fireEquipmentPoint1.get();
+            }
+            
             if (fireEquipmentPoint != null) {
-                this.fireEquipmentPointDao.delete(Long.parseLong(id));
+                this.fireEquipmentPointDao.deleteById(Long.parseLong(id));
             } else {
                 throw new Exception("找不到指定的监测点:" + id);
             }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/FireEquipServiceImpl.java

@@ -22,6 +22,7 @@ import org.springframework.stereotype.Service;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 @Service("fireEquipService")
 public class FireEquipServiceImpl implements IFireEquipService {
@@ -59,14 +60,23 @@ public class FireEquipServiceImpl implements IFireEquipService {
 
 
     public FireEquipment queryOne(Long id) {
-        return iFireEquipmentDao.findById(id);
+    	Optional<FireEquipment> fireEquipment1=iFireEquipmentDao.findById(id);
+    	if(fireEquipment1.isPresent()){
+    		return fireEquipment1.get();
+    	}
+    	return null;
     }
 
     public String[] delete(String[] idArray) throws Exception {
         for (String id : idArray) {
-            FireEquipment fireEquipment = iFireEquipmentDao.findById(Long.parseLong(id));
+            Optional<FireEquipment> fireEquipment1 = iFireEquipmentDao.findById(Long.parseLong(id));
+            FireEquipment fireEquipment=null;
+            if(fireEquipment1.isPresent()){
+            	fireEquipment= fireEquipment1.get();
+        	}
+            
             if (fireEquipment != null) {
-                this.iFireEquipmentDao.delete(Long.parseLong(id));
+                this.iFireEquipmentDao.deleteById(Long.parseLong(id));
             	node3dVoMapper.incrementalDeleteFierEqumt(Long.parseLong(id));
             } else {
                 throw new Exception("找不到指定的对象:" + id);
@@ -147,24 +157,40 @@ public class FireEquipServiceImpl implements IFireEquipService {
         {
             case pool:
             case hydrant:
-                WaterResource waterResource = this.iWaterResourceDao.findById(id);
-                returnEntity = waterResource;
+                Optional<WaterResource> waterResource = this.iWaterResourceDao.findById(id);
+                if(waterResource.isPresent()){
+                	returnEntity = waterResource.get();
+            	}
+                
+                
                 break;
             case fireFoamRoom:
             case fireChamber:
-                FireStation fireStation = iFireStationDao.findById(id);
+                Optional<FireStation> fireStation1 = iFireStationDao.findById(id);
+                FireStation fireStation=null;
+                if(fireStation1.isPresent()){
+                	 fireStation=fireStation1.get();
+            	}
                 fireStation.setFireEquipmentInfo(this.fireEquipMapper.queryForGroupCount(id));
                 returnEntity = fireStation;
                 break;
             case extinguisher:
             case video:
             case monitorEquipment:
-                FireEquipment fireEquipment = this.iFireEquipmentDao.findById(id);
+                Optional<FireEquipment> fireEquipment1 = this.iFireEquipmentDao.findById(id);
+                FireEquipment fireEquipment=null;
+                if(fireEquipment1.isPresent()){
+                	fireEquipment=fireEquipment1.get();
+            	}
                 fireEquipment.setProtectObjNames(this.impEquipMapper.queryProtectObjNames(fireEquipment.getId()));
                 returnEntity = fireEquipment;
                 break;
             case fireDetection:
-                FireEquipment fireDetection = this.iFireEquipmentDao.findById(id);
+                Optional<FireEquipment> fireDetection1 = this.iFireEquipmentDao.findById(id);
+                FireEquipment fireDetection=null;
+                if(fireDetection1.isPresent()){
+                	fireDetection=fireDetection1.get();
+            	}
                 fireDetection.setProtectObjNames(this.impEquipMapper.queryProtectObjNames(fireDetection.getId()));
                 returnEntity = fireDetection;
                 break;

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/FireStationServiceImpl.java

@@ -6,6 +6,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -71,8 +72,18 @@ public class FireStationServiceImpl implements IFireStationService {
 			List<FireStationFireEquipment> fireStationFireEquipments) throws Exception {
 
 		for (FireStationFireEquipment fireStationFireEquipment : fireStationFireEquipments) {
-			FireStation fireStation = iFireStationDao.findById(fireStationFireEquipment.getFireStationId());
-			FireEquipment fireEquipment = iFireEquipmentDao.findById(fireStationFireEquipment.getFireEquipmentId());
+			Optional<FireStation> fireStation1 = iFireStationDao.findById(fireStationFireEquipment.getFireStationId());
+			Optional<FireEquipment> fireEquipment1 = iFireEquipmentDao.findById(fireStationFireEquipment.getFireEquipmentId());
+			FireStation fireStation=null;
+			FireEquipment fireEquipment=null;
+			if(fireStation1.isPresent()){
+				 fireStation=fireStation1.get();
+			}
+			if(fireEquipment1.isPresent()){
+				fireEquipment=fireEquipment1.get();
+			}
+			
+			
 			Map map = fireStationEquipmentMapper.queryRelation(fireStationFireEquipment.getFireStationId(),
 					fireStationFireEquipment.getFireEquipmentId());
 			if (fireStation == null)
@@ -94,7 +105,7 @@ public class FireStationServiceImpl implements IFireStationService {
 					fireStationFireEquipment.getFireEquipmentId());
 			if (!CollectionUtils.isEmpty(map)) {
 				Long id = Long.parseLong(String.valueOf(map.get("id")));
-				this.iFireStationEquipmentDao.delete(id);
+				this.iFireStationEquipmentDao.deleteById(id);
 
 			} else {
 				throw new Exception("指定的数据不存在.");
@@ -116,9 +127,13 @@ public class FireStationServiceImpl implements IFireStationService {
 
 	public String[] delete(String[] idArray) throws Exception {
 		for (String id : idArray) {
-			FireStation fireStation = iFireStationDao.findById(Long.parseLong(id));
+			Optional<FireStation> fireStation1 = iFireStationDao.findById(Long.parseLong(id));
+			FireStation fireStation=null;
+			if(fireStation1.isPresent()){
+				fireStation=fireStation1.get();
+			}
 			if (fireStation != null) {
-				this.iFireStationDao.delete(Long.parseLong(id));
+				this.iFireStationDao.deleteById(Long.parseLong(id));
 				node3dVoMapper.incrementalDeleteStation(Long.parseLong(id));
 			} else {
 				throw new Exception("找不到指定的监测点:" + id);

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/FireStrengthServiceImpl.java

@@ -12,6 +12,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 @Service("fireStengthService")
 public class FireStrengthServiceImpl implements FireStengthService {
@@ -38,10 +39,14 @@ public class FireStrengthServiceImpl implements FireStengthService {
 	{
 		for(String id:idArray)
 		{
-			FireStrength fireEquipmentPoint = fireStrengthPointDao.findById(Long.parseLong(id));
+			Optional<FireStrength> fireEquipmentPoint1 = fireStrengthPointDao.findById(Long.parseLong(id));
+			FireStrength fireEquipmentPoint =null;
+			if(fireEquipmentPoint1.isPresent()){
+				fireEquipmentPoint=fireEquipmentPoint1.get();
+			}
 			if(fireEquipmentPoint != null)
 			{
-				this.fireStrengthPointDao.delete(Long.parseLong(id));
+				this.fireStrengthPointDao.deleteById(Long.parseLong(id));
 			}else
 			{
 				throw new Exception("找不到指定的监测点:"+id);

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/FmeaServiceImpl.java

@@ -27,6 +27,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.UUID;
 
 @Service("fmeaService")
@@ -65,7 +66,7 @@ public class FmeaServiceImpl implements IFmeaService {
         List<Fmea> fmeas = (List<Fmea>) paramMap.get("fmeas");
         fmeas.forEach(fmea -> {
             String userId = paramMap.get("user_id") == null ? "0" : paramMap.get("user_id").toString();
-            fmea.setCreateBy(Integer.parseInt(userId));
+            fmea.setCreateBy(userId);
 //            RiskSource riskSource = iRiskSourceDao.findById(fmea.getRiskSourceId());
 //            fmea.setRiskSource(riskSource);
             iFmeaDao.save(fmea);
@@ -177,7 +178,11 @@ public class FmeaServiceImpl implements IFmeaService {
         riskSourceRo.setRiskState(riskSource.getStatus());
 
         riskSourceRo.setRpni(rpni);
-        RiskLevel riskLevel = iRiskLevelDao.findOne(riskSource.getRiskLevelId());
+        Optional<RiskLevel> riskLevel1 = iRiskLevelDao.findById(riskSource.getRiskLevelId());
+        RiskLevel riskLevel =null;
+        if(riskLevel1.isPresent()){
+        	riskLevel=riskLevel1.get();
+        }
         if (riskLevel != null) {
             riskSourceRo.setRiskLevel(riskLevel.getLevel());
         }
@@ -190,7 +195,11 @@ public class FmeaServiceImpl implements IFmeaService {
         if (!CollectionUtils.isEmpty(fmeaList)) {
             for (Fmea fmea : fmeaList) {
                 RPNiSum.add(fmea.getRpni());
-                RiskFactor factor = iRiskFactorDao.findOne(fmea.getRiskFactorsId());
+                RiskFactor factor =null;
+                Optional<RiskFactor> factor1 = iRiskFactorDao.findById(fmea.getRiskFactorsId());
+                if(factor1.isPresent()){
+                	factor=factor1.get();
+                }
                 if (factor != null)
                     riskFactor += factor.getName() + "\n";
             }
@@ -221,7 +230,11 @@ public class FmeaServiceImpl implements IFmeaService {
         Integer maxLevel = 0;
         List<RiskSource> anomalyRiskSource = findAnomalyRiskSource(regionRiskSourceId);
         for (RiskSource anomaly : anomalyRiskSource) {
-            RiskLevel anomalyLevel = this.iRiskLevelDao.findOne(anomaly.getRiskLevelId());
+            Optional<RiskLevel> anomalyLevel1 = this.iRiskLevelDao.findById(anomaly.getRiskLevelId());
+            RiskLevel anomalyLevel =null;
+            if(anomalyLevel1.isPresent()){
+            	 anomalyLevel =anomalyLevel1.get();
+            }
             if (anomalyLevel != null && anomalyLevel.getLevel() > maxLevel)
                 maxLevel = anomalyLevel.getLevel();
         }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/ITopographyNodeServiceImpl.java

@@ -33,7 +33,7 @@ public class ITopographyNodeServiceImpl implements ITopographyNodeService{
 			TopographyNode node = nodeData.stream().filter(n->topographyNode.getId().equals(n.getId())).findFirst().get();
 			topographyNode.setLoc(node.getLoc());
 		}
-		topographyNodeDao.save(list);
+		topographyNodeDao.saveAll(list);
 		
 	}
 

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/PlanVisual3dServiceImpl.java

@@ -8,10 +8,10 @@ import com.yeejoin.amos.fas.business.feign.IMaasVisualServer;
 import com.yeejoin.amos.fas.business.service.intfc.IDictService;
 import com.yeejoin.amos.fas.business.service.intfc.IPlanVisual3dService;
 import com.yeejoin.amos.fas.business.vo.TreeSubjectVo;
+import com.yeejoin.amos.fas.core.util.CommonResponse;
+import com.yeejoin.amos.fas.core.util.CommonResponseUtil;
 import com.yeejoin.amos.fas.dao.entity.Dict;
 import com.yeejoin.amos.fas.dao.entity.TextPlan;
-import com.yeejoin.amos.op.core.common.response.CommonResponse;
-import com.yeejoin.amos.op.core.util.CommonResponseUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -63,7 +63,11 @@ public class PlanVisual3dServiceImpl implements IPlanVisual3dService {
 
     @Override
     public TextPlan getTextPlanInfoById(Long id) {
-        return iTextPlanDao.findOne(id);
+    	Optional<TextPlan> textPlan =iTextPlanDao.findById(id);
+    	if(textPlan.isPresent()){
+    		return textPlan.get();
+    	}
+    	return null;
     }
 
     private List<TreeSubjectVo> listToTree(List<Object> list) {

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/WaterResourceServiceImpl.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.fas.business.service.impl;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -59,10 +60,14 @@ public class WaterResourceServiceImpl implements IWaterResourceService {
 	{
 		for(String id:idArray)
 		{
-			WaterResource waterResource = iWaterResourceDao.findById(Long.parseLong(id));
+			Optional<WaterResource> waterResource1 = iWaterResourceDao.findById(Long.parseLong(id));
+			WaterResource waterResource = null;
+			if(waterResource1.isPresent()){
+				waterResource=waterResource1.get();
+			}
 			if(waterResource != null)
 			{
-				this.iWaterResourceDao.delete(Long.parseLong(id));
+				this.iWaterResourceDao.deleteById(Long.parseLong(id));
 				node3dVoMapper.incrementalDeleteWater(Long.parseLong(id));
 			}else
 			{
@@ -93,7 +98,7 @@ public class WaterResourceServiceImpl implements IWaterResourceService {
 					saveList.add(waterResourceEquipment);
 				}
 			}
-			iWaterResourceEquipmentDao.save(saveList);
+			iWaterResourceEquipmentDao.saveAll(saveList);
 		}
 
 
@@ -107,7 +112,7 @@ public class WaterResourceServiceImpl implements IWaterResourceService {
 					deleteList.add(waterResourceEquipment);
 				}
 			}
-			iWaterResourceEquipmentDao.delete(deleteList);
+			iWaterResourceEquipmentDao.deleteAll(deleteList);
 		}
 
 

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/intfc/AMOSSecurityServer.java

 package com.yeejoin.amos.fas.business.service.intfc;
 
-import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import com.yeejoin.amos.op.core.common.response.CommonResponse;
+import com.yeejoin.amos.fas.core.util.CommonResponse;
+
 
 @FeignClient("AMOSSECURITY")
 public interface AMOSSecurityServer {