合并eqintegration代码

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

@@ -111,7 +111,49 @@ public class StationInfo extends BasicEntity{
     /**
      * 备注
      */
-    private String remark; 
+    private String remark;
+
+    /**
+     * 换流站负责人姓名
+     */
+    @Column(name="station_charge_user_name")
+    private String stationChargeUserName;
+
+    /**
+     * 安全负责人姓名
+     */
+    @Column(name="safety_charge_user_name")
+    private String safetyChargeUserName;
+
+    /**
+     * 安全负责人姓名
+     */
+    @Column(name="create_user_name")
+    private String createUserName;
+
+    public void setCreateUserName(String createUserName) {
+        this.createUserName = createUserName;
+    }
+
+    public String getCreateUserName() {
+        return createUserName;
+    }
+
+    public String getStationChargeUserName() {
+        return stationChargeUserName;
+    }
+
+    public String getSafetyChargeUserName() {
+        return safetyChargeUserName;
+    }
+
+    public void setStationChargeUserName(String stationChargeUserName) {
+        this.stationChargeUserName = stationChargeUserName;
+    }
+
+    public void setSafetyChargeUserName(String safetyChargeUserName) {
+        this.safetyChargeUserName = safetyChargeUserName;
+    }
 
     public String getName() {
         return name;

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

@@ -5,6 +5,7 @@ import com.yeejoin.amos.fas.config.Permission;
 import com.yeejoin.amos.fas.core.util.CommonResponse;
 import com.yeejoin.amos.fas.core.util.CommonResponseUtil;
 import com.yeejoin.amos.fas.dao.entity.StationInfo;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,8 +32,11 @@ public class StationMaintenController extends BaseController{
     @PostMapping(value = "/save")
     public CommonResponse saveStation(@RequestBody StationInfo stationParams) {
 
+        AgencyUserModel userModel = getUserInfo();
         stationParams.setCreateBy(getUserId());
         stationParams.setCreateDate(new Date());
+        stationParams.setCreateUserName(userModel.getUserName());
+
 
         stationMaintenService.save(stationParams);
         return CommonResponseUtil.success();

YeeAmosFireAutoSysStart/src/main/resources/db/changelog/fas-2.0.1.xml

@@ -482,5 +482,41 @@
 			) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='应急预案执行记录实例';
 		</sql>
     </changeSet>
-    
+
+    <changeSet author="keyong" id="1605924681-1">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="f_station_info" columnName="station_charge_user_name" />
+            </not>
+        </preConditions>
+        <comment>修改f_station_info表结构</comment>
+        <sql>
+            ALTER TABLE `f_station_info` ADD COLUMN `station_charge_user_name` varchar(20) NULL COMMENT '换流站负责人姓名';
+        </sql>
+    </changeSet>
+
+    <changeSet author="keyong" id="1605924681-2">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="f_station_info" columnName="safety_charge_user_name" />
+            </not>
+        </preConditions>
+        <comment>修改f_station_info表结构</comment>
+        <sql>
+            ALTER TABLE `f_station_info` ADD COLUMN `safety_charge_user_name` varchar(20) NULL COMMENT '安全负责人姓名';
+        </sql>
+    </changeSet>
+
+    <changeSet author="keyong" id="1605924681-3">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="f_station_info" columnName="create_user_name" />
+            </not>
+        </preConditions>
+        <comment>修改f_station_info表结构</comment>
+        <sql>
+            ALTER TABLE `f_station_info` ADD COLUMN `create_user_name` varchar(20) NULL COMMENT '创建人姓名';
+        </sql>
+    </changeSet>
+
 </databaseChangeLog>
\ No newline at end of file