专职站增加名称字段

data-ui/src/views/data/digitalfirecontrol/fulltimestation/index.vue

@@ -1,6 +1,15 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px"  @submit.native.prevent>
+      <el-form-item label="名称" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="地址" prop="address">
         <el-input
           v-model="queryParams.address"
@@ -78,6 +87,7 @@
     <el-table v-loading="loading" :data="fulltimestationList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
       <!--<el-table-column label="主键id" align="center" prop="id"/>-->
+      <el-table-column label="名称" align="center" prop="name"/>
       <el-table-column label="地址" align="center" prop="address"/>
       <el-table-column label="负责人" align="center" prop="principal"/>
       <el-table-column label="联系电话" align="center" prop="contactsPhone"/>
@@ -123,18 +133,24 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="12">
+            <el-form-item label="名称" prop="name">
+              <el-input v-model="form.name" placeholder="请输入名称" maxlength="20"/>
+            </el-form-item>
             <el-form-item label="负责人" prop="principal">
               <el-input v-model="form.principal" placeholder="请输入负责人" maxlength="20"/>
             </el-form-item>
             <el-form-item label="经度" prop="longitude" @dblclick.native="showMap">
               <el-input v-model="form.longitude" placeholder="鼠标双击此处以选择经纬度" maxlength="32"/>
             </el-form-item>
-            <el-form-item label="地址" prop="address">
-              <el-input v-model="form.address" placeholder="请输入地址" maxlength="20"/>
+            <el-form-item label="所属部门" prop="deptId">
+              <treeselect v-model="form.deptId" :options="deptOptions" multiple:false :show-count="true" :noResultsText="'空'" :noOptionsText="'空'"
+                          placeholder="请选择部门" @select="hx"/>
             </el-form-item>
-
           </el-col>
           <el-col :span="12">
+            <el-form-item label="地址" prop="address">
+              <el-input v-model="form.address" placeholder="请输入地址" maxlength="20"/>
+            </el-form-item>
             <el-form-item label="联系电话" prop="contactsPhone">
               <el-input v-model="form.contactsPhone" placeholder="请输入联系电话" maxlength="20"/>
             </el-form-item>
@@ -142,10 +158,6 @@
             <el-form-item label="纬度" prop="latitude" @dblclick.native="showMap">
               <el-input v-model="form.latitude" placeholder="鼠标双击此处以选择经纬度" maxlength="32"/>
             </el-form-item>
-            <el-form-item label="所属部门" prop="deptId">
-              <treeselect v-model="form.deptId" :options="deptOptions" multiple:false :show-count="true" :noResultsText="'空'" :noOptionsText="'空'"
-                          placeholder="请选择部门" @select="hx"/>
-            </el-form-item>
 <!--            <el-form-item label="所属部门" prop="deptId">-->
 <!--              <Deptselector :setValue=setDataDeptId :dataDeptId="form.deptId"/>-->
 <!--            </el-form-item>-->
@@ -249,6 +261,9 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        name: [
+          {required: true, message: '名称不能为空', trigger: 'blur'}
+        ],
         address: [
           {required: true, message: '地址不能为空', trigger: 'blur'}
         ],

src/main/java/com/sooka/sponest/data/digitalfirecontrol/domain/CenterdataTFirecontrolFulltimeStation.java

@@ -84,7 +84,8 @@ public class CenterdataTFirecontrolFulltimeStation extends BaseBusinessEntity {
     @NotBlank(message = "所属部门不能为空")
     private String deptName;
 
-    @ApiModelProperty(value = "名称", required = false)
+    @ApiModelProperty(value = "名称", required = true)
+    @NotBlank(message = "名称不能为空")
     private String name;
     public List<String> getdeviceList() {
         return deviceList;

src/main/java/com/sooka/sponest/data/digitalfirecontrol/service/impl/CenterdataTFirecontrolFulltimeStationServiceImpl.java

@@ -65,7 +65,6 @@ public class CenterdataTFirecontrolFulltimeStationServiceImpl extends BaseServic
     @Override
     public int insertCenterdataTFirecontrolFulltimeStation(CenterdataTFirecontrolFulltimeStation centerdataTFirecontrolFulltimeStation) {
         centerdataTFirecontrolFulltimeStation.setId(IdUtils.simpleUUID());
-        centerdataTFirecontrolFulltimeStation.setName(centerdataTFirecontrolFulltimeStation.getPrincipal());
         centerdataTFirecontrolFulltimeStation.setCreateBy(SecurityUtils.getUserId().toString());
         centerdataTFirecontrolFulltimeStation.setCreateName(SecurityUtils.getLoginUser().getSysUser().getNickName());
         centerdataTFirecontrolFulltimeStation.setCreateTime(DateUtils.getNowDate());
@@ -90,7 +89,6 @@ public class CenterdataTFirecontrolFulltimeStationServiceImpl extends BaseServic
      */
     @Override
     public int updateCenterdataTFirecontrolFulltimeStation(CenterdataTFirecontrolFulltimeStation centerdataTFirecontrolFulltimeStation) {
-        centerdataTFirecontrolFulltimeStation.setName(centerdataTFirecontrolFulltimeStation.getPrincipal());
         centerdataTFirecontrolFulltimeStation.setUpdateBy(SecurityUtils.getUserId());
         centerdataTFirecontrolFulltimeStation.setUpdateName(SecurityUtils.getLoginUser().getSysUser().getNickName());
         centerdataTFirecontrolFulltimeStation.setUpdateTime(DateUtils.getNowDate());

src/main/resources/mapper/digitalfirecontrol/CenterdataTFirecontrolFulltimeStationMapper.xml

@@ -32,6 +32,7 @@
         select a.* from centerdata_t_firecontrol_fulltime_station a
         left join ${database_system}.sys_dept d ON d.dept_id = a.dept_id
         <where>
+            <if test="name != null  and name != ''">and name LIKE CONCAT('%',#{name}, '%') </if>
             <if test="address != null  and address != ''">and address LIKE CONCAT('%',#{address}, '%') </if>
             <if test="principal != null  and principal != ''">and principal LIKE CONCAT('%',#{principal}, '%')</if>
             <if test="contactsPhone != null  and contactsPhone != ''">and contacts_phone = #{contactsPhone}</if>
@@ -106,7 +107,7 @@
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateName != null">update_name = #{updateName},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="principal != null">name = #{principal},</if>
+            <if test="principal != null">name = #{name},</if>
         </trim>
         where id = #{id}
     </update>