Merge branch 'dev_upgrade' of http://172.16.10.76/station/YeeAmosFireAutoSysRoot into dev_upgrade

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

@@ -19,10 +19,10 @@ public class AccidentType extends BasicEntity  {
 
 
 	@Column(name="create_by")
-	private Long createBy;
+	private String createBy;
 
 	@Column(name="dept_id")
-	private Long deptId;
+	private String deptId;
 
 
 	private String name;
@@ -45,22 +45,36 @@ public class AccidentType extends BasicEntity  {
 	}
 
 
-	public Long getCreateBy() {
-		return this.createBy;
+	
+
+	public String getCreateBy() {
+		return createBy;
 	}
 
-	public void setCreateBy(Long createBy) {
+
+
+
+	public void setCreateBy(String createBy) {
 		this.createBy = createBy;
 	}
 
-	public Long getDeptId() {
-		return this.deptId;
+
+
+
+	public String getDeptId() {
+		return deptId;
 	}
 
-	public void setDeptId(Long deptId) {
+
+
+
+	public void setDeptId(String deptId) {
 		this.deptId = deptId;
 	}
 
+
+
+
 	@Transient
 	public String getInfluence() {
 		return this.influence;

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

@@ -45,10 +45,10 @@ public class Equipment extends BasicEntity  {
 	private Boolean isIndoor;
 
 	@Column(name="charge_dept_id")
-	private int chargeDeptId;
+	private String chargeDeptId;
 
 	@Column(name="charge_user_id")
-	private int chargeUserId;
+	private String chargeUserId;
 
 	private String code;
 
@@ -147,19 +147,21 @@ public class Equipment extends BasicEntity  {
 		this.riskSourceId = riskSourceId;
 	}
 
-	public int getChargeDeptId() {
-		return this.chargeDeptId;
+	
+
+	public String getChargeDeptId() {
+		return chargeDeptId;
 	}
 
-	public void setChargeDeptId(int chargeDeptId) {
+	public void setChargeDeptId(String chargeDeptId) {
 		this.chargeDeptId = chargeDeptId;
 	}
 
-	public int getChargeUserId() {
-		return this.chargeUserId;
+	public String getChargeUserId() {
+		return chargeUserId;
 	}
 
-	public void setChargeUserId(int chargeUserId) {
+	public void setChargeUserId(String chargeUserId) {
 		this.chargeUserId = chargeUserId;
 	}
 

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

@@ -18,7 +18,7 @@ public class EvaluationModel extends BasicEntity  {
 	private static final long serialVersionUID = 1L;
 
 	@Column(name="create_by")
-	private int createBy;
+	private String createBy;
 
 	private String name;
 	
@@ -54,11 +54,11 @@ public class EvaluationModel extends BasicEntity  {
 	public EvaluationModel() {
 	}
 
-	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/FireStation.java

@@ -72,7 +72,7 @@ public class FireStation extends BasicEntity{
 	 * 创建人
 	 */
 	@Column(name="create_by")
-	private int createBy;
+	private String createBy;
 	
 	
 	@Column(name="picture")
@@ -165,11 +165,11 @@ public class FireStation extends BasicEntity{
 		this.orgCode = orgCode;
 	}
 
-	public int getCreateBy() {
+	public String getCreateBy() {
 		return createBy;
 	}
 
-	public void setCreateBy(int createBy) {
+	public void setCreateBy(String createBy) {
 		this.createBy = createBy;
 	}
 

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

@@ -45,7 +45,7 @@ public class FireStationFireEquipment extends BasicEntity{
 	 * 创建人
 	 */
 	@Column(name="create_by")
-	private int createBy;
+	private String createBy;
 
 	public Long getFireStationId() {
 		return fireStationId;
@@ -79,11 +79,11 @@ public class FireStationFireEquipment extends BasicEntity{
 		this.unit = unit;
 	}
 
-	public int getCreateBy() {
+	public String getCreateBy() {
 		return createBy;
 	}
 
-	public void setCreateBy(int createBy) {
+	public void setCreateBy(String createBy) {
 		this.createBy = createBy;
 	}
 

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

@@ -78,7 +78,7 @@ public class FireStrength extends BasicEntity{
 	 * 创建人
 	 */
 	@Column(name="create_by")
-	private int createBy;
+	private String createBy;
 	
 	public String getCode() {
 		return code;
@@ -144,11 +144,11 @@ public class FireStrength extends BasicEntity{
 		this.orgCode = orgCode;
 	}
 
-	public int getCreateBy() {
+	public String getCreateBy() {
 		return createBy;
 	}
 
-	public void setCreateBy(int createBy) {
+	public void setCreateBy(String createBy) {
 		this.createBy = createBy;
 	}
 

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

@@ -91,7 +91,7 @@ public class Fmea extends BasicEntity {
     private String personLeader;
 
     @Column(name = "identify_user")
-    private Integer identifyUser;
+    private String identifyUser;
 
     @Column(name = "identify_method")
     private String identifyMethod;
@@ -298,11 +298,11 @@ public class Fmea extends BasicEntity {
         this.personLeader = personLeader;
     }
 
-    public Integer getIdentifyUser() {
+    public String getIdentifyUser() {
         return identifyUser;
     }
 
-    public void setIdentifyUser(Integer identifyUser) {
+    public void setIdentifyUser(String identifyUser) {
         this.identifyUser = identifyUser;
     }
 

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

@@ -17,7 +17,7 @@ public class PreplanPicture extends BasicEntity {
     private static final long serialVersionUID = 1L;
 
     @Column(name = "create_by")
-    private int createBy;
+    private String createBy;
 
     @Column(name = "equipment_id")
     private Long equipmentId;
@@ -34,11 +34,11 @@ public class PreplanPicture extends BasicEntity {
     public PreplanPicture() {
     }
 
-    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/RiskFactor.java

@@ -20,10 +20,10 @@ public class RiskFactor extends BasicEntity  {
 	private Long accidentTypeId;
 
 	@Column(name="create_by")
-	private int createBy;
+	private String createBy;
 
 	@Column(name="dept_id")
-	private Long deptId;
+	private String deptId;
 
 	private String name;
 
@@ -45,19 +45,19 @@ public class RiskFactor extends BasicEntity  {
 		this.accidentTypeId = accidentTypeId;
 	}
 
-	public int getCreateBy() {
+	public String getCreateBy() {
 		return this.createBy;
 	}
 
-	public void setCreateBy(int createBy) {
+	public void setCreateBy(String createBy) {
 		this.createBy = createBy;
 	}
 
-	public Long getDeptId() {
+	public String getDeptId() {
 		return this.deptId;
 	}
 
-	public void setDeptId(Long deptId) {
+	public void setDeptId(String deptId) {
 		this.deptId = deptId;
 	}
 

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

@@ -19,7 +19,7 @@ public class RiskLevel extends BasicEntity {
     private String color;
 
     @Column(name = "create_by")
-    private Long createBy;
+    private String createBy;
 
     @Column(name = "evaluation_model_id")
     private Long evaluationModelId;
@@ -64,11 +64,13 @@ public class RiskLevel extends BasicEntity {
         this.color = color;
     }
 
-    public Long getCreateBy() {
-        return this.createBy;
+   
+
+    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/RiskSource.java

@@ -29,7 +29,7 @@ public class RiskSource extends BasicEntity {
 	private Boolean isIndoor;
 
 	@Column(name = "create_by")
-	private int createBy;
+	private String createBy;
 
 	private String name;
 
@@ -142,11 +142,11 @@ public class RiskSource 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/WaterResource.java

@@ -81,7 +81,7 @@ public class WaterResource extends BasicEntity{
 	 * 创建人
 	 */
 	@Column(name="create_by")
-	private int createBy;
+	private String createBy;
 
 	/**
 	 * ue4位置
@@ -184,11 +184,11 @@ public class WaterResource extends BasicEntity{
 		this.orgCode = orgCode;
 	}
 
-	public int getCreateBy() {
+	public String getCreateBy() {
 		return createBy;
 	}
 
-	public void setCreateBy(int createBy) {
+	public void setCreateBy(String createBy) {
 		this.createBy = createBy;
 	}
 

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

@@ -37,7 +37,7 @@ public class FireStationController extends BaseController {
 			throw new Exception("数据校验失败.");
 		ReginParams reginParams =getSelectedOrgInfo();
 		String compCode=getOrgCode(reginParams);
-		fireStation.setCreateBy(0);
+		fireStation.setCreateBy("0");
 		fireStation.setCreateDate(new Date());
 		fireStation.setOrgCode(compCode);
 		return CommonResponseUtil.success(iFireStationService.save(fireStation));
@@ -52,7 +52,7 @@ public class FireStationController extends BaseController {
 			throw new Exception("数据校验失败.");
 
 		for (FireStationFireEquipment fireStationFireEquipment : fireStationFireEquipments) {
-			fireStationFireEquipment.setCreateBy(0);
+			fireStationFireEquipment.setCreateBy("0");
 			fireStationFireEquipment.setCreateDate(new Date());
 		}
 		return CommonResponseUtil.success(iFireStationService.saveStationFireEquipment(fireStationFireEquipments));
@@ -136,7 +136,7 @@ public class FireStationController extends BaseController {
 			throw new Exception("数据校验失败.");
 		ReginParams reginParams =getSelectedOrgInfo();
 		String compCode=getOrgCode(reginParams);
-		fireStation.setCreateBy(0);
+		fireStation.setCreateBy("0");
 		fireStation.setCreateDate(new Date());
 		fireStation.setOrgCode(compCode);
 		return CommonResponseUtil.success(iFireStationService.saveAndUpd(fireStation, file));

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

@@ -41,7 +41,7 @@ public class FireStrengthController extends BaseController{
                 || StringUtils.isEmpty(fireStrength.getCode() ))
             throw new Exception("数据校验失败.");
 
-        fireStrength.setCreateBy(0);
+        fireStrength.setCreateBy("0");
         fireStrength.setCreateDate(new Date());
         return CommonResponseUtil.success(fireStengthService.savePoint(fireStrength));
     }

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

@@ -48,7 +48,7 @@ public class WaterResourceController extends BaseController{
             throw new Exception("数据校验失败.");
 		ReginParams reginParams =getSelectedOrgInfo();
 		String compCode=getOrgCode(reginParams);
-        waterResource.setCreateBy(0);
+        waterResource.setCreateBy("0");
         waterResource.setCreateDate(new Date());
         waterResource.setOrgCode(compCode);
         return CommonResponseUtil.success(iWaterResourceService.save(waterResource));

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

+
 package com.yeejoin.amos.fas.business.service.impl;
 
 import java.util.ArrayList;
@@ -63,8 +64,8 @@ public class AccidentTypeServiceImpl implements IAccidentTypeService {
 		String userId = map.get("user_id")== null ? "0":map.get("user_id").toString();
 		String deptId = map.get("dept_id")== null ? "0":map.get("dept_id").toString();
 		param.setOrgCode(orgCode);
-		param.setDeptId(Long.parseLong(deptId));
-		param.setCreateBy(Long.parseLong(userId));
+		param.setDeptId(deptId);
+		param.setCreateBy(userId);
 		param.setCreateDate(new Date());
 		iAccidentTypeDao.save(param);
 	}
@@ -94,27 +95,19 @@ public class AccidentTypeServiceImpl implements IAccidentTypeService {
 				deptIdList.add(deptId);
 			}
 		}
-		Map<String, String> userMap =  new HashMap<String,String>();
-		Map<String, String> deptMap =  new HashMap<String,String>();
-		
-        if(userIdList.size()>0)
-        {
 		List<AgencyUserModel> users =remoteSecurityService.listUserByUserIds(toke, product, appKey, Joiner.on(",").join(userIdList));
+		Map<String, String> userMap =  new HashMap<String,String>();
         for (int i = 0; i < users.size(); i++) {
         	userMap.put(users.get(i).getUserId(), users.get(i).getUserName());
 		}
-        }		
-        if(deptIdList.size()>0)
-        {
 	    List<LinkedHashMap> depts =remoteSecurityService.listDepartmentByDeptIds(toke, product, appKey, Joiner.on(",").join(deptIdList));
-    		  
+	    Map<String, String> deptMap =  new HashMap<String,String>();
         for (int i = 0; i < depts.size(); i++) {
         	deptMap.put(depts.get(i).get("sequenceNbr").toString(), depts.get(i).get("departmentName").toString());
 		}
-        }
         content.forEach(e -> {
-            e.put("userName",userMap.get(String.valueOf(e.get("createBy"))));
-            e.put("deptName",deptMap.get(String.valueOf(e.get("deptId"))));
+            e.put("userName",userMap.get(e.get("createBy")));
+            e.put("deptName",deptMap.get(e.get("deptId")));
         });
 		Page<HashMap<String, Object>> result = new PageImpl<>(content, param, total);
 		return result;

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

@@ -259,7 +259,7 @@ public class EquipmentServiceImpl implements IEquipmentService {
             pp.setEquipmentId(equipmentId);
             pp.setType(type);
             pp.setCreateDate(new Date());
-            pp.setCreateBy(userId.intValue());
+            pp.setCreateBy(userId.intValue()+"");
         }
 
         String path = FasConstant.UPLOAD_ROOT_PATH + File.separator + FasConstant.UPLOAD_EQUIPMENT_PATH + File.separator
@@ -283,7 +283,7 @@ public class EquipmentServiceImpl implements IEquipmentService {
             throw new YeeException("上传图片失败");
         }
         String picture = path + fileName;
-        pp.setCreateBy(userId.intValue());
+        pp.setCreateBy(userId.intValue()+"");
         pp.setPicture(picture);
         if (equipment.getCreateDate() == null) {
         	Optional<Equipment>  date=iEquipmentDao.findById(equipment.getId());

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

@@ -61,28 +61,19 @@ public class RiskFactorServiceImpl implements IRiskFactorService {
 				deptIdList.add(deptId);
 			}
 		}
-		Map<String, String> userMap =  new HashMap<String,String>();
-		Map<String, String> deptMap =  new HashMap<String,String>();
-		
-        if(userIdList.size()>0)
-        {
 		List<AgencyUserModel> users =remoteSecurityService.listUserByUserIds(toke, product, appKey, Joiner.on(",").join(userIdList));
+		Map<String, String> userMap =  new HashMap<String,String>();
         for (int i = 0; i < users.size(); i++) {
         	userMap.put(users.get(i).getUserId(), users.get(i).getUserName());
 		}
-        }		
-        if(deptIdList.size()>0)
-        {
 	    List<LinkedHashMap> depts =remoteSecurityService.listDepartmentByDeptIds(toke, product, appKey, Joiner.on(",").join(deptIdList));
-    		  
+	    Map<String, String> deptMap =  new HashMap<String,String>();
         for (int i = 0; i < depts.size(); i++) {
         	deptMap.put(depts.get(i).get("sequenceNbr").toString(), depts.get(i).get("departmentName").toString());
 		}
-        }
-
         content.forEach(e -> {
-            e.put("userName",userMap.get(String.valueOf(e.get("createBy"))));
-            e.put("deptName",deptMap.get(String.valueOf(e.get("deptId"))));
+            e.put("userName",userMap.get(e.get("createBy")));
+            e.put("deptName",deptMap.get(e.get("deptId")));
         });
         Page<HashMap<String, Object>> result = new PageImpl<>(content, param, total);
         return result;
@@ -100,8 +91,8 @@ public class RiskFactorServiceImpl implements IRiskFactorService {
         String userId = map.get("user_id") == null ? "0" : map.get("user_id").toString();
         String deptId = map.get("dept_id") == null ? "0" : map.get("dept_id").toString();
         param.setOrgCode(orgCode);
-        param.setDeptId(Long.parseLong(deptId));
-        param.setCreateBy(Integer.parseInt(userId));
+        param.setDeptId(deptId);
+        param.setCreateBy(userId);
         param.setCreateDate(new Date());
 
 

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

+
 package com.yeejoin.amos.fas.business.service.impl;
 
 import java.util.ArrayList;
@@ -74,7 +75,7 @@ public class RiskLevelServiceImpl implements IRiskLevelService {
 		String orgCode = map.get("org_code") == null ? "":map.get("org_code").toString();
 		String userId = map.get("user_id")== null ? "0":map.get("user_id").toString();
 		param.setOrgCode(orgCode);
-		param.setCreateBy(Long.parseLong(userId));
+		param.setCreateBy(userId);
 		param.setCreateDate(new Date());
 		iRiskLevelDao.save(param);
 	}
@@ -119,3 +120,4 @@ public class RiskLevelServiceImpl implements IRiskLevelService {
 	}
 
 }
+

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

+
 package com.yeejoin.amos.fas.business.service.impl;
 
 import java.math.BigDecimal;
@@ -229,7 +230,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
         String orgCode = map.get("org_code") == null ? "" : map.get("org_code").toString();
         String userId = map.get("user_id") == null ? "0" : map.get("user_id").toString();
         riskSource.setOrgCode(orgCode);
-        riskSource.setCreateBy(Integer.parseInt(userId));
+        riskSource.setCreateBy(userId);
         Optional<RiskSource> oldRiskSource1 = iRiskSourceDao.findById(id);
         RiskSource oldRiskSource = null;
         if (oldRiskSource1.isPresent()) {

YeeAmosFireAutoSysStart/src/main/resources/db/changelog/init/fas-create-table.sql

@@ -11,8 +11,8 @@ CREATE TABLE `f_accident_type` (
   `evaluation_sid` bigint(32) DEFAULT NULL COMMENT 'evaluation_model 中 type 为s 的id',
   `influence` varchar(255) DEFAULT NULL COMMENT '失效/事故影响',
   `severity` varchar(255) DEFAULT NULL COMMENT '严重度',
-  `dept_id` int(11) DEFAULT '0' COMMENT '维护部门',
-  `create_by` int(11) DEFAULT '0' COMMENT '维护人员',
+  `dept_id` varchar(255) DEFAULT '0' COMMENT '维护部门',
+  `create_by` varchar(255) DEFAULT '0' COMMENT '维护人员',
   `create_date` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '维护时间',
   `remark` varchar(255) DEFAULT NULL COMMENT '备注',
   PRIMARY KEY (`id`) USING BTREE
@@ -67,8 +67,8 @@ CREATE TABLE `f_equipment` (
   `building` varchar(255) DEFAULT NULL COMMENT '建筑物',
   `room` varchar(255) DEFAULT NULL COMMENT '房间号',
   `address` varchar(255) DEFAULT NULL COMMENT '位置',
-  `charge_dept_id` int(11) DEFAULT '0' COMMENT '责任部门',
-  `charge_user_id` int(1) DEFAULT '0' COMMENT '责任人',
+  `charge_dept_id` varchar(255) DEFAULT '0' COMMENT '责任部门',
+  `charge_user_id` varchar(255) DEFAULT '0' COMMENT '责任人',
   `remark` varchar(255) DEFAULT NULL COMMENT '备注',
   `create_by` varchar(255) DEFAULT '0' COMMENT '创建者',
   `create_date` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '创建时间',
@@ -102,7 +102,7 @@ CREATE TABLE `f_evaluation_model` (
   `name` varchar(100) DEFAULT NULL COMMENT '模型名称',
   `standard` text COMMENT '模型内容',
   `create_date` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '维护时间',
-  `create_by` int(11) DEFAULT '0' COMMENT '创建者',
+  `create_by` varchar(255) DEFAULT '0' COMMENT '创建者',
   `remark` varchar(255) DEFAULT NULL COMMENT '备注',
   `coefficient` varchar(50) DEFAULT NULL COMMENT '系数',
   `influence` varchar(500) DEFAULT NULL COMMENT '影响',
@@ -240,7 +240,7 @@ CREATE TABLE `f_fire_station` (
   `position3d` varchar(100) DEFAULT NULL COMMENT '3维坐标',
   `is_indoor` bit(1) DEFAULT b'1' COMMENT '是否室内点：默认是',
   `org_code` varchar(50) DEFAULT NULL COMMENT '组织',
-  `create_by` bigint(20) DEFAULT '0' COMMENT '维护人员',
+  `create_by` varchar(255) DEFAULT '0' COMMENT '维护人员',
   `create_date` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '维护时间',
   `picture` varchar(1000) DEFAULT NULL COMMENT '图片',
   `risk_source_id` bigint(20) DEFAULT '0' COMMENT '风险区域id',
@@ -256,7 +256,7 @@ CREATE TABLE `f_fire_station_equipment` (
   `fire_station_id` bigint(20) NOT NULL COMMENT '消防站id',
   `fire_equipment_id` bigint(20) NOT NULL COMMENT '消防物资id',
   `number` double DEFAULT NULL COMMENT '个数',
-  `create_by` bigint(20) DEFAULT '0' COMMENT '维护人员',
+  `create_by` varchar(255) DEFAULT '0' COMMENT '维护人员',
   `create_date` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '维护时间',
   `unit` varchar(32) DEFAULT NULL,
   PRIMARY KEY (`id`) USING BTREE
@@ -276,7 +276,7 @@ CREATE TABLE `f_fire_strength` (
   `job_des` varchar(500) DEFAULT NULL COMMENT '工作描述',
   `remark` varchar(500) DEFAULT NULL COMMENT '备注',
   `org_code` varchar(255) DEFAULT NULL COMMENT '组织',
-  `create_by` bigint(20) DEFAULT '0' COMMENT '维护人员',
+  `create_by` varchar(255) DEFAULT '0' COMMENT '维护人员',
   `create_date` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '维护时间',
   `day_end` time DEFAULT NULL COMMENT '结束时间',
   `day_begin` time DEFAULT NULL COMMENT '开始时间',
@@ -307,7 +307,7 @@ CREATE TABLE `f_fmea` (
   `department_leader` varchar(255) DEFAULT NULL COMMENT '部门负责人',
   `group_leader` varchar(255) DEFAULT NULL COMMENT '班组负责人',
   `person_leader` varchar(255) DEFAULT NULL COMMENT '个人负责人',
-  `identify_user` int(11) DEFAULT NULL COMMENT '辨识人',
+  `identify_user` varchar(255) DEFAULT NULL COMMENT '辨识人',
   `identify_method` varchar(255) DEFAULT NULL COMMENT '辨识方法',
   `create_date` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '创建时间',
   `create_by` varchar(255) DEFAULT '0' COMMENT '创建者',
@@ -353,7 +353,7 @@ CREATE TABLE `f_preplan_picture` (
   `name` varchar(255) DEFAULT NULL COMMENT '装备名称',
   `picture` text COMMENT '图片路径地址',
   `remark` varchar(255) DEFAULT NULL COMMENT '备注',
-  `create_by` int(11) DEFAULT '0' COMMENT '创建者',
+  `create_by` varchar(255) DEFAULT '0' COMMENT '创建者',
   `create_date` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '创建时间',
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE=InnoDB AUTO_INCREMENT=161 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='重点设备预案图';
@@ -368,8 +368,8 @@ CREATE TABLE `f_risk_factor` (
   `name` varchar(255) DEFAULT NULL COMMENT '名称',
   `accident_type_id` bigint(20) NOT NULL COMMENT '失效/事故影响',
   `type` varchar(255) DEFAULT NULL COMMENT '分类',
-  `dept_id` int(11) DEFAULT '0' COMMENT '维护部门',
-  `create_by` int(11) DEFAULT '0' COMMENT '维护人员',
+  `dept_id` varchar(255) DEFAULT '0' COMMENT '维护部门',
+  `create_by` varchar(255) DEFAULT '0' COMMENT '维护人员',
   `create_date` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '维护时间',
   `remark` varchar(255) DEFAULT NULL COMMENT '备注',
   PRIMARY KEY (`id`) USING BTREE
@@ -387,7 +387,7 @@ CREATE TABLE `f_risk_level` (
   `severity` varchar(255) DEFAULT NULL COMMENT '严重度',
   `name` varchar(255) DEFAULT NULL COMMENT '结果描述',
   `color` varchar(255) DEFAULT NULL COMMENT '图标颜色',
-  `create_by` int(11) DEFAULT '0' COMMENT '维护人员',
+  `create_by` varchar(255) DEFAULT '0' COMMENT '维护人员',
   `create_date` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '维护时间',
   `remark` varchar(255) DEFAULT NULL COMMENT '备注',
   `top_limit` decimal(10,2) DEFAULT NULL COMMENT '上限',
@@ -411,7 +411,7 @@ CREATE TABLE `f_risk_source` (
   `risk_level_id` bigint(20) DEFAULT '0' COMMENT '风险等级id',
   `rpn` decimal(10,2) DEFAULT NULL COMMENT '实时rpn',
   `remark` varchar(255) DEFAULT NULL COMMENT '备注',
-  `create_by` int(11) DEFAULT '0' COMMENT '创建者',
+  `create_by` varchar(255) DEFAULT '0' COMMENT '创建者',
   `create_date` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '创建时间',
   `is_region` varchar(16) DEFAULT NULL,
   `status` varchar(16) DEFAULT NULL COMMENT '状态(正常NORMAL，异常ANOMALY)',
@@ -563,7 +563,7 @@ CREATE TABLE `f_water_resource` (
   `address` varchar(255) DEFAULT NULL COMMENT '位置',
   `position3d` varchar(100) DEFAULT NULL COMMENT '3维坐标',
   `org_code` varchar(50) DEFAULT NULL COMMENT '组织',
-  `create_by` bigint(20) DEFAULT '0' COMMENT '维护人员',
+  `create_by` varchar(255) DEFAULT '0' COMMENT '维护人员',
   `create_date` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '维护时间',
   `is_indoor` bit(1) DEFAULT b'1' COMMENT '是否室内点：默认是',
   `risk_source_id` bigint(20) DEFAULT '0' COMMENT '风险区域id',