f_accident_type create_by dept_id long改为 varchar

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

@@ -63,8 +63,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);
 	}

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

@@ -91,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

@@ -64,7 +64,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);
 	}

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

@@ -229,7 +229,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()) {